diff options
571 files changed, 18628 insertions, 9038 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 98a7022088eb2..4c5ac8ab05562 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -240,11 +240,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis -/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis -/nixos/modules/virtualisation/podman @zowoq @adisbladis -/nixos/tests/cri-o.nix @zowoq @adisbladis -/nixos/tests/podman @zowoq @adisbladis +/nixos/modules/virtualisation/containers.nix @adisbladis +/nixos/modules/virtualisation/cri-o.nix @adisbladis +/nixos/modules/virtualisation/podman @adisbladis +/nixos/tests/cri-o.nix @adisbladis +/nixos/tests/podman @adisbladis # Docker tools /pkgs/build-support/docker @roberth @@ -275,12 +275,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # terraform providers /pkgs/applications/networking/cluster/terraform-providers @zowoq -# kubernetes -/nixos/doc/manual/configuration/kubernetes.chapter.md @zowoq -/nixos/modules/services/cluster/kubernetes @zowoq -/nixos/tests/kubernetes @zowoq -/pkgs/applications/networking/cluster/kubernetes @zowoq - # Matrix /pkgs/servers/heisenbridge @piegamesde /pkgs/servers/matrix-conduit @piegamesde diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 4d6dd876abd1f..d171e84191882 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1190,11 +1190,12 @@ following are specific to `buildPythonPackage`: variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this - defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications - to `""`. + defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pipInstallFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `pipInstallFlags=["--install-option='--cpp_implementation'"]`. +* `pipBuildFlags ? []`: A list of strings. Arguments to be passed to `pip wheel`. +* `pypaBuildFlags ? []`: A list of strings. Arguments to be passed to `python -m build --wheel`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. @@ -1249,6 +1250,27 @@ with import <nixpkgs> {}; in python.withPackages(ps: [ ps.blaze ])).env ``` +The next example shows a non trivial overriding of the `blas` implementation to +be used through out all of the Python package set: + +```nix +python3MyBlas = pkgs.python3.override { + packageOverrides = self: super: { + # We need toPythonModule for the package set to evaluate this + blas = super.toPythonModule(super.pkgs.blas.override { + blasProvider = super.pkgs.mkl; + }); + lapack = super.toPythonModule(super.pkgs.lapack.override { + lapackProvider = super.pkgs.mkl; + }); + }; +}; +``` + +This is particularly useful for numpy and scipy users who want to gain speed with other blas implementations. +Note that using simply `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in +compilation issues, because scipy dependencies need to use the same blas implementation as well. + #### Optional extra dependencies {#python-optional-dependencies} Some packages define optional dependencies for additional features. With @@ -1468,6 +1490,10 @@ are used in `buildPythonPackage`. - `flitBuildHook` to build a wheel using `flit`. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. +- `pypaBuildHook` to build a wheel using + [`pypa/build`](https://pypa-build.readthedocs.io/en/latest/index.html) and + PEP 517/518. Note a build system (e.g. `setuptools` or `flit`) should still + be added as `nativeBuildInput`. - `pipInstallHook` to install wheels. - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). - `pythonCatchConflictsHook` to check whether a Python package is not already existing. diff --git a/lib/types.nix b/lib/types.nix index ddd37f260c9a6..b602d1d7f781f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -436,10 +436,7 @@ rec { # Deprecated; should not be used because it quietly concatenates # strings, which is usually not what you want. - string = separatedString "" // { - name = "string"; - deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; - }; + string = throw "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // { name = "passwdEntry ${entryType.name}"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0f2c6e93f292a..b62bf967ebfc8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11727,6 +11727,12 @@ githubId = 38578268; name = "Morgan Wolfe"; }; + mxkrsv = { + email = "mxkrsv@disroot.org"; + github = "mxkrsv"; + githubId = 59313755; + name = "Maxim Karasev"; + }; myaats = { email = "mats@mats.sh"; github = "Myaats"; @@ -12730,6 +12736,11 @@ githubId = 357005; name = "Marco Orovecchia"; }; + orthros = { + github = "orthros"; + githubId = 7820716; + name = "orthros"; + }; osener = { email = "ozan@ozansener.com"; github = "osener"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f541d01a684bc..975a1e2c42c9a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -425,7 +425,6 @@ with lib.maintainers; { offline saschagrunert srhb - zowoq ]; scope = "Maintain the Kubernetes package and module"; shortName = "Kubernetes"; @@ -712,7 +711,6 @@ with lib.maintainers; { adisbladis saschagrunert vdemeester - zowoq ]; githubTeams = [ "podman" diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index c69e8b4317ced..d87d3b5c92f05 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -42,6 +42,8 @@ - [systemd-sysupdate](https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html), atomically updates the host OS, container images, portable service images or other sources. Available as [systemd.sysupdate](opt-systemd.sysupdate). +- [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 77f5f6516751e..5852843b8021d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -807,6 +807,7 @@ ./services/network-filesystems/davfs2.nix ./services/network-filesystems/diod.nix ./services/network-filesystems/drbd.nix + ./services/network-filesystems/eris-server.nix ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/kbfs.nix ./services/network-filesystems/kubo.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 4120d5919d7d7..19e7eb32e833f 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -120,5 +120,8 @@ with lib; [PStore] Unlink=no ''; + + # allow nix-copy to live system + nix.settings.trusted-users = [ "root" "nixos" ]; }; } diff --git a/nixos/modules/services/network-filesystems/eris-server.nix b/nixos/modules/services/network-filesystems/eris-server.nix new file mode 100644 index 0000000000000..66eccfac408c4 --- /dev/null +++ b/nixos/modules/services/network-filesystems/eris-server.nix @@ -0,0 +1,103 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.eris-server; + stateDirectoryPath = "\${STATE_DIRECTORY}"; +in { + + options.services.eris-server = { + + enable = lib.mkEnableOption "an ERIS server"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.eris-go; + defaultText = lib.literalExpression "pkgs.eris-go"; + description = "Package to use for the ERIS server."; + }; + + decode = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether the HTTP service (when enabled) will decode ERIS content at /uri-res/N2R?urn:eris:. + Enabling this is recommended only for private or local-only servers. + ''; + }; + + listenCoap = lib.mkOption { + type = lib.types.str; + default = ":5683"; + example = "[::1]:5683"; + description = '' + Server CoAP listen address. Listen on all IP addresses at port 5683 by default. + Please note that the server can service client requests for ERIS-blocks by + querying other clients connected to the server. Whether or not blocks are + relayed back to the server depends on client configuration but be aware this + may leak sensitive metadata and trigger network activity. + ''; + }; + + listenHttp = lib.mkOption { + type = lib.types.str; + default = ""; + example = "[::1]:8080"; + description = "Server HTTP listen address. Do not listen by default."; + }; + + backends = lib.mkOption { + type = with lib.types; listOf str; + description = '' + List of backend URLs. + Add "get" and "put" as query elements to enable those operations. + ''; + example = [ + "bolt+file:///srv/eris.bolt?get&put" + "coap+tcp://eris.example.com:5683?get" + ]; + }; + + mountpoint = lib.mkOption { + type = lib.types.str; + default = ""; + example = "/eris"; + description = '' + Mountpoint for FUSE namespace that exposes "urn:eris:…" files. + ''; + }; + + }; + + config = lib.mkIf cfg.enable { + systemd.services.eris-server = let + cmd = + "${cfg.package}/bin/eris-go server --coap '${cfg.listenCoap}' --http '${cfg.listenHttp}' ${ + lib.optionalString cfg.decode "--decode " + }${ + lib.optionalString (cfg.mountpoint != "") + ''--mountpoint "${cfg.mountpoint}" '' + }${lib.strings.escapeShellArgs cfg.backends}"; + in { + description = "ERIS block server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = lib.mkIf (cfg.mountpoint != "") '' + export PATH=${config.security.wrapperDir}:$PATH + ${cmd} + ''; + serviceConfig = let + umounter = lib.mkIf (cfg.mountpoint != "") + "-${config.security.wrapperDir}/fusermount -uz ${cfg.mountpoint}"; + in { + ExecStartPre = umounter; + ExecStart = lib.mkIf (cfg.mountpoint == "") cmd; + ExecStopPost = umounter; + Restart = "always"; + RestartSec = 20; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ ehmry ]; +} diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index 082e0195093ef..741f054cd88be 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -71,9 +71,9 @@ let if ! keyValid; then echo "certificate soon to become invalid; backing up old cert" mkdir -p oldkeys - mv -v ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key - mv -v ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt - systemctl restart dnscrypt-wrapper + mv -v "${cfg.providerName}.key" "oldkeys/${cfg.providerName}-$(date +%F-%T).key" + mv -v "${cfg.providerName}.crt" "oldkeys/${cfg.providerName}-$(date +%F-%T).crt" + kill "$(pidof -s dnscrypt-wrapper)" fi ''; @@ -222,17 +222,6 @@ in { }; users.groups.dnscrypt-wrapper = { }; - security.polkit.extraConfig = '' - // Allow dnscrypt-wrapper user to restart dnscrypt-wrapper.service - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.systemd1.manage-units" && - action.lookup("unit") == "dnscrypt-wrapper.service" && - subject.user == "dnscrypt-wrapper") { - return polkit.Result.YES; - } - }); - ''; - systemd.services.dnscrypt-wrapper = { description = "dnscrypt-wrapper daemon"; after = [ "network.target" ]; @@ -242,7 +231,7 @@ in { serviceConfig = { User = "dnscrypt-wrapper"; WorkingDirectory = dataDir; - Restart = "on-failure"; + Restart = "always"; ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}"; }; @@ -255,7 +244,7 @@ in { requires = [ "dnscrypt-wrapper.service" ]; description = "Rotates DNSCrypt wrapper keys if soon to expire"; - path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk ]; + path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk procps ]; script = rotateKeys; serviceConfig.User = "dnscrypt-wrapper"; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3b4a39f5ff96b..06d63b4f2d07e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -217,7 +217,7 @@ in { disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; - dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; + dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper; dnsdist = handleTest ./dnsdist.nix {}; doas = handleTest ./doas.nix {}; docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {}; @@ -252,6 +252,7 @@ in { envoy = handleTest ./envoy.nix {}; ergo = handleTest ./ergo.nix {}; ergochat = handleTest ./ergochat.nix {}; + eris-server = handleTest ./eris-server.nix {}; esphome = handleTest ./esphome.nix {}; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; activation = pkgs.callPackage ../modules/system/activation/test.nix { }; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index ed88f08739e85..238091ec606f5 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -22,22 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { ''; services.caddy.enableReload = true; - specialisation.etag.configuration = { - services.caddy.extraConfig = lib.mkForce '' - http://localhost { - encode gzip - - file_server - root * ${ - pkgs.runCommand "testdir2" {} '' - mkdir "$out" - echo changed > "$out/example.html" - '' - } - } - ''; - }; - specialisation.config-reload.configuration = { services.caddy.extraConfig = '' http://localhost:8080 { @@ -55,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = { nodes, ... }: let - etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etag"; justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload"; multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs"; in @@ -65,33 +48,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { webserver.wait_for_open_port(80) - def check_etag(url): - etag = webserver.succeed( - "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( - url - ) - ) - etag = etag.replace("\r\n", " ") - http_code = webserver.succeed( - "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( - etag, url - ) - ) - assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) - return etag - - - with subtest("check ETag if serving Nix store paths"): - old_etag = check_etag(url) - webserver.succeed( - "${etagSystem}/bin/switch-to-configuration test >&2" - ) - webserver.sleep(1) - new_etag = check_etag(url) - assert old_etag != new_etag, "Old ETag {} is the same as {}".format( - old_etag, new_etag - ) - with subtest("config is reloaded on nixos-rebuild switch"): webserver.succeed( "${justReloadSystem}/bin/switch-to-configuration test >&2" diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix index 1bdd064e1130c..1c05376e097b3 100644 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixos/tests/dnscrypt-wrapper/default.nix @@ -1,4 +1,6 @@ -import ../make-test-python.nix ({ pkgs, ... }: { +{ lib, pkgs, ... }: + +{ name = "dnscrypt-wrapper"; meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; @@ -50,23 +52,23 @@ import ../make-test-python.nix ({ pkgs, ... }: { server.wait_for_unit("dnscrypt-wrapper") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt") + almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip() with subtest("The client can connect to the server"): server.wait_for_unit("tinydns") client.wait_for_unit("dnscrypt-proxy2") - assert "1.2.3.4" in client.succeed( + assert "1.2.3.4" in client.wait_until_succeeds( "host it.works" ), "The IP address of 'it.works' does not match 1.2.3.4" with subtest("The server rotates the ephemeral keys"): # advance time by a little less than 5 days - server.succeed("date -s \"$(date --date '4 days 6 hours')\"") - client.succeed("date -s \"$(date --date '4 days 6 hours')\"") + server.succeed(f"date -s '{almost_expiration}'") + client.succeed(f"date -s '{almost_expiration}'") server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys") with subtest("The client can still connect to the server"): server.wait_for_unit("dnscrypt-wrapper") client.succeed("host it.works") ''; -}) - +} diff --git a/nixos/tests/eris-server.nix b/nixos/tests/eris-server.nix new file mode 100644 index 0000000000000..a50db3afebf5f --- /dev/null +++ b/nixos/tests/eris-server.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "eris-server"; + meta.maintainers = with lib.maintainers; [ ehmry ]; + + nodes.server = { + environment.systemPackages = [ pkgs.eris-go pkgs.nim.pkgs.eris ]; + services.eris-server = { + enable = true; + decode = true; + listenHttp = "[::1]:80"; + backends = [ "badger+file:///var/cache/eris.badger?get&put" ]; + mountpoint = "/eris"; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("eris-server.service") + server.wait_for_open_port(5683) + server.wait_for_open_port(80) + server.succeed("eriscmd get http://[::1] $(echo 'Hail ERIS!' | eriscmd put coap+tcp://[::1]:5683)") + ''; +}) diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix index e9d88d1f236f6..f0fde190db99c 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/applications/audio/hushboard/default.nix @@ -26,10 +26,10 @@ buildPythonApplication { nativeBuildInputs = [ wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libappindicator libpulseaudio diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index b536de637acfd..004823ee52d71 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -1,16 +1,16 @@ { lib -, python3 , fetchPypi +, python3 }: python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.67"; + version = "2.0.69"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lFxAMjglQZXCySr83PtvStU6hw2ucQu+rSjIHo1yZBk="; + hash = "sha256-gkO6XYiPMkU/zRLvc0yd3jJXVcAgAkR1W1ELTSN461o="; }; postPatch = '' @@ -52,7 +52,7 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects"; + description = "Network based LED effect controller with support for advanced real-time audio effects"; homepage = "https://github.com/LedFx/LedFx"; changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; license = licenses.gpl3Only; diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index 055662ce743f8..888087afb79f6 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -34,9 +34,9 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 gobject-introspection sox ]; + buildInputs = [ gtk3 sox ]; dontWrapGApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 70e7217dff79e..e0cf106e460b7 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CLI PulseAudio Volume Control"; homepage = "https://github.com/falconindy/ponymix"; + mainProgram = "ponymix"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 9cd6b0d9ae052..394ccc3b723d0 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { itstool wrapGAppsHook desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -72,7 +73,6 @@ stdenv.mkDerivation rec { brasero grilo - gobject-introspection python3.pkgs.pygobject3 gst_all_1.gstreamer diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 208d50a2773c2..bc7a6ea5a1f11 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 fdk-aac-encoder - gobject-introspection gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -28,6 +27,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 43724953eea64..18e0cfe257f80 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config python3Packages.wrapPython + gobject-introspection ]; buildInputs = [ flac - gobject-introspection gtk3 libappindicator libnotify diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix new file mode 100644 index 0000000000000..60520c069bd6f --- /dev/null +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, libpcap +}: + +buildGoModule rec { + pname = "optimism"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "ethereum-optimism"; + repo = "optimism"; + rev = "op-node/v${version}"; + hash = "sha256-COTpmjDH1u2dJA0nKPBG1Aocpyyo8NdtowwjHDTbEKI="; + fetchSubmodules = true; + }; + + subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; + + vendorHash = "sha256-yAUeCX05dCVEvIzp0cXB/qYVtu3gQfgFi1CNZZKllOU="; + + buildInputs = [ + libpcap + ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Optimism is Ethereum, scaled"; + homepage = "https://github.com/ethereum-optimism/optimism"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix new file mode 100644 index 0000000000000..ab854f64f7a4d --- /dev/null +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, libobjc +, IOKit +}: + +buildGoModule rec { + pname = "op-geth"; + version = "1.101106.0"; + + src = fetchFromGitHub { + owner = "ethereum-optimism"; + repo = "op-geth"; + rev = "v${version}"; + hash = "sha256-hLng9DMzRN43m0+GAc6Bn0c9heuekghn4ZdDKgQcSKY="; + fetchSubmodules = true; + }; + + subPackages = [ + "cmd/abidump" + "cmd/abigen" + "cmd/bootnode" + "cmd/clef" + "cmd/devp2p" + "cmd/ethkey" + "cmd/evm" + "cmd/faucet" + "cmd/geth" + "cmd/p2psim" + "cmd/rlpdump" + "cmd/utils" + ]; + + vendorHash = "sha256-bGEvBXG6q9m5go+4mAlOu424ReTbfwVhkohN+FikBMg="; + + # Fix for usb-related segmentation faults on darwin + propagatedBuildInputs = + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/ethereum-optimism/op-geth"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 674b27330802d..00bb6dea3256b 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -24,9 +24,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook sassc ]; + appstream-glib wrapGAppsHook sassc gobject-introspection ]; - buildInputs = [ glib pythonEnv gobject-introspection gtk3 + buildInputs = [ glib pythonEnv gtk3 gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 23a668fa4a754..f4568cb121b59 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -225,17 +225,14 @@ license = lib.licenses.free; }; }) {}; - altcaps = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.1.0.0.20230101.152850"; + version = "1.1.0.0.20230801.43558"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.1.0.0.20230101.152850.tar"; - sha256 = "112c8yv5vbz78j83qacv0d97lxmxyr7m3mk0l7hm7556424y5v3v"; + url = "https://elpa.gnu.org/devel/altcaps-1.1.0.0.20230801.43558.tar"; + sha256 = "12z37dc7add0lq1fqzjx9ipmzgnpymn4pipk3q1x9sngrg06q8q0"; }; packageRequires = [ emacs ]; meta = { @@ -297,10 +294,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.7.0.20230528.62258"; + version = "1.9.7.0.20230802.104021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.7.0.20230528.62258.tar"; - sha256 = "15gl3p29id1gzza6m39q9w23yiydfhcq7ckk0m8hj8i1y5d7bb7n"; + url = "https://elpa.gnu.org/devel/async-1.9.7.0.20230802.104021.tar"; + sha256 = "1w300q3fgnpibsbgkmxpicxv5ba8xj7cv9i28j7854b49d6xvjb6"; }; packageRequires = [ emacs ]; meta = { @@ -308,17 +305,14 @@ license = lib.licenses.free; }; }) {}; - auctex = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.0.0.20230424.174359"; + version = "13.2.1.0.20230720.82135"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-13.2.0.0.20230424.174359.tar"; - sha256 = "1p5xy6hhpsvjd14vdb3bsdvcmalgn9nc0a73fjslpfv7n8kzh94s"; + url = "https://elpa.gnu.org/devel/auctex-13.2.1.0.20230720.82135.tar"; + sha256 = "0m973vyb37d57309f51rbds3lvf908484p71a4l216q63qzmidnj"; }; packageRequires = [ emacs ]; meta = { @@ -460,10 +454,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "0.3.0.0.20230521.62220"; + version = "0.3.0.0.20230707.42330"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20230521.62220.tar"; - sha256 = "0hr2yqasiq7l4alvi96jjq23rz9g2dpsvg3mrfph01qarnhnwhga"; + url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20230707.42330.tar"; + sha256 = "12a7hhdjw9fy5mh3sj7jyb249vlmrl45r4wq4faap23mdnbygw49"; }; packageRequires = [ emacs ]; meta = { @@ -478,10 +472,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20230101.54747"; + version = "2.4.1.0.20230804.31751"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230101.54747.tar"; - sha256 = "0x6h8kbigak7m8570jz40iym0mzsjran090391f99dn6ka7qdsp2"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230804.31751.tar"; + sha256 = "1h02g1lcl27fsz1jvisdy4fjp4ddknr9d1qj633bkmg3nrr06mr2"; }; packageRequires = [ emacs ]; meta = { @@ -653,6 +647,24 @@ license = lib.licenses.free; }; }) {}; + buildbot = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "buildbot"; + ename = "buildbot"; + version = "0.0.1.0.20230726.134747"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar"; + sha256 = "1knkx80fcmxhi8y3ns3vb4zrg8s6la81gr3rbs1v3fss4h1snka1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buildbot.html"; + license = lib.licenses.free; + }; + }) {}; calibre = callPackage ({ compat , elpaBuild , emacs @@ -676,10 +688,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.15.0.20230606.90445"; + version = "0.16.0.20230713.173507"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.15.0.20230606.90445.tar"; - sha256 = "0r63wp2h7qf7na1jcj1brgw86bvs3fs5xb2a3r24832wd0j5shic"; + url = "https://elpa.gnu.org/devel/cape-0.16.0.20230713.173507.tar"; + sha256 = "0qy7crwvzkhbb3gyg3dg18gpb1x83rk6vqspz23bifrvgwyg3pxz"; }; packageRequires = [ compat emacs ]; meta = { @@ -878,10 +890,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.13.0.20230416.203422"; + version = "0.9.13.0.20230805.204526"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.9.13.0.20230416.203422.tar"; - sha256 = "1iwzhz938s11fwndiv59qcviqc5gwam08a6ygamlzr4z626i5zyh"; + url = "https://elpa.gnu.org/devel/company-0.9.13.0.20230805.204526.tar"; + sha256 = "1z9kmx7r8wpy2vvzp6a12q48xcf43i0bqw56j2h0112h19m9zj8k"; }; packageRequires = [ emacs ]; meta = { @@ -954,10 +966,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.1.0.20230524.90557"; + version = "29.1.4.2.0.20230802.161111"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.1.0.20230524.90557.tar"; - sha256 = "0k3g7mi18hcxz6jprqjw23mc82v9935vavffg1x96xmnbk633fpm"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230802.161111.tar"; + sha256 = "17fqkg9r73gmb19nxdyx7wy9c0kyqwbzhfps7j2lfrvkfzki008l"; }; packageRequires = [ emacs seq ]; meta = { @@ -969,10 +981,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.34.0.20230609.165451"; + version = "0.35.0.20230729.232921"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.34.0.20230609.165451.tar"; - sha256 = "0dhh82ywl144dx8d7r3qc88h17jp63is4qljmvcvjaxv00dhh866"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20230729.232921.tar"; + sha256 = "196m2flc1zhdy3iac3bk59l9402zhk4c7q99iblj7zmrf4bg5x7g"; }; packageRequires = [ compat emacs ]; meta = { @@ -1021,10 +1033,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.36.0.20200206.121427"; + version = "0.37.0.20230714.150159"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.36.0.20200206.121427.tar"; - sha256 = "169mwgip42rcin1bs76lq0586wzh4acllxdzgqq8nhb15ja90k1z"; + url = "https://elpa.gnu.org/devel/corfu-0.37.0.20230714.150159.tar"; + sha256 = "0270bfs4g6fcz4sqic3dxmafr2a0fggwqsybnh3dq7z3jcp86d89"; }; packageRequires = [ compat emacs ]; meta = { @@ -1056,10 +1068,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.0.0.20230410.182848"; + version = "0.14.0.0.20230619.162538"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.0.0.20230410.182848.tar"; - sha256 = "0lqrbw1b9xypfsnjp4mijas0xi6h6bsrvv5maclvlnfp7pc7xbls"; + url = "https://elpa.gnu.org/devel/counsel-0.14.0.0.20230619.162538.tar"; + sha256 = "0lirnz10p9zyvdhwwqgvc7wasm31syifb2khxdwi4bqqgrmpqvix"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1091,10 +1103,10 @@ elpaBuild { pname = "cpupower"; ename = "cpupower"; - version = "1.0.5.0.20220514.74621"; + version = "1.0.5.0.20230704.131557"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20220514.74621.tar"; - sha256 = "0r9rivdclr9s76kllwvi3smwf3ij1dxssbfc1wrkxpw4wav2bci6"; + url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar"; + sha256 = "03c5lbm9vmgx5m5pmi4a12npmf1v6g7kiryfxx6j2zy1ix9nk4jl"; }; packageRequires = []; meta = { @@ -1173,10 +1185,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.0.0.20230609.51943"; + version = "1.0.1.0.20230802.44321"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.0.0.20230609.51943.tar"; - sha256 = "0c0hqrg2xbc3k5f2hvsg9amvv05flrjlc2xdx1ychh7nabz6x0nl"; + url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20230802.44321.tar"; + sha256 = "0ih37zhvr5p4q7ijix3fyi5vv26w0gc7vk53ns3n9yv4dnbprxdk"; }; packageRequires = [ emacs ]; meta = { @@ -1220,10 +1232,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.1.0.20230502.132438"; + version = "2.19.1.0.20230714.72308"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230502.132438.tar"; - sha256 = "1jjy8izqb3s0zald16zjigpvl81kvmjax5b3wn34abik6nkvaypl"; + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230714.72308.tar"; + sha256 = "084vilvl6s74mv5p34n0hl8zif8zxzgizwd78zz6nhnlakzinqb5"; }; packageRequires = [ emacs ]; meta = { @@ -1253,10 +1265,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.35.0.20221213.83424"; + version = "0.36.0.20230619.72121"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.35.0.20221213.83424.tar"; - sha256 = "10s6vqvb4l136xry4683ahdq42s71bx19cvhip0x91rslcd6rrbd"; + url = "https://elpa.gnu.org/devel/debbugs-0.36.0.20230619.72121.tar"; + sha256 = "1abg80d397ndb7sds8p8d3z9zw2v5m4a87l9jqmi7b6pp07z7ah7"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1283,10 +1295,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "1.2.0.0.20230611.160303"; + version = "2.0.0.0.20230801.45022"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-1.2.0.0.20230611.160303.tar"; - sha256 = "13xb6h6ww12j301zkjvw8kb702cxz3xj7blj6qhw6bs5i7qs90vy"; + url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20230801.45022.tar"; + sha256 = "09qca4wqfz3gnji48gb5n0x1iv59k63xbgc53b2iggfxrfdblg4n"; }; packageRequires = [ emacs ]; meta = { @@ -1366,18 +1378,14 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: + diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20230423.183732"; + version = "1.9.2.0.20230714.2731"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230423.183732.tar"; - sha256 = "1wgsd9c3n9f7sw0ma1i28dc0riwfv3f9gw43h3xbgydqw7hqa0r4"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230714.2731.tar"; + sha256 = "0wpnbzz96j5v4pln9fh5szhjn3358b084wfmp07ld4bw07fcqpxb"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1452,6 +1460,24 @@ license = lib.licenses.free; }; }) {}; + dired-preview = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "dired-preview"; + ename = "dired-preview"; + version = "0.1.1.0.20230713.184118"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20230713.184118.tar"; + sha256 = "1vrm6k9sdbgsjbx6s0yz250n08sp6pg5rwgly2y0zwxdxmhkx7br"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-preview.html"; + license = lib.licenses.free; + }; + }) {}; disk-usage = callPackage ({ elpaBuild , emacs , fetchurl @@ -1585,10 +1611,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.17.0.20230219.150703"; + version = "0.8.17.0.20230720.84151"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.17.0.20230219.150703.tar"; - sha256 = "12zbh8556b0kmiwb2w7slb0cw8yba8drn873b3bd6bj6431pgkbv"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.17.0.20230720.84151.tar"; + sha256 = "1nd0jd4y8zg5i4ng7k40h6j00hr416i07cmnqqpxvh6h3kycahsw"; }; packageRequires = [ emacs seq ]; meta = { @@ -1671,10 +1697,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.1.1.0.20230608.174002"; + version = "1.2.0.0.20230802.50954"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.1.1.0.20230608.174002.tar"; - sha256 = "1lgn60jbansq45y5g8c3vb10rsd82d2vzcn3diqpwj2f5vl88zl4"; + url = "https://elpa.gnu.org/devel/ef-themes-1.2.0.0.20230802.50954.tar"; + sha256 = "0sfcqcccpki50fia7z4bbx93z91rd3l8jfq4xwswxqppsx4icwgj"; }; packageRequires = [ emacs ]; meta = { @@ -1696,10 +1722,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20230609.11219"; + version = "1.15.0.20230803.101902"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230609.11219.tar"; - sha256 = "1p6nhkg6nwkxbn4378bpwc8qrqr53srxxrwvnmzwzxfz047hbqaq"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230803.101902.tar"; + sha256 = "1vi1k5bps3gcp0vvl3zrysgbsccfn75mymvr8r8r062wwy6djbra"; }; packageRequires = [ eldoc @@ -1809,10 +1835,10 @@ elpaBuild { pname = "emacs-gc-stats"; ename = "emacs-gc-stats"; - version = "1.1.0.20230611.93624"; + version = "1.4.1.0.20230721.81431"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.1.0.20230611.93624.tar"; - sha256 = "0ybipxwdzfzmx6k2a20q9gb8ymb4pwbkk0qxic34g2czq8kba79k"; + url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.1.0.20230721.81431.tar"; + sha256 = "044q2xviir38m467fs22mfx5p0s42dp7758fikwfqawqcsggr7hp"; }; packageRequires = [ emacs ]; meta = { @@ -1824,10 +1850,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.22.1.0.20230613.15430"; + version = "0.22.1.0.20230805.85826"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230613.15430.tar"; - sha256 = "099ja8d1h7282vwbijagh7n0fign6i21i8mz90wcw4ykwqqij5i5"; + url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230805.85826.tar"; + sha256 = "1gdh5w97qpyj4bkbifhfxbv921xy21fqks65y23y97yp618y94zg"; }; packageRequires = [ compat emacs ]; meta = { @@ -1844,10 +1870,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.7.0.20230613.15430"; + version = "0.7.0.20230805.85826"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230613.15430.tar"; - sha256 = "0nv4wd2r2v7a8i7mn3pp70hba1664vp7ccix6ws2h8aflmqxc405"; + url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230805.85826.tar"; + sha256 = "0z50h4h029qxp8rl0ipq1m41k5w0cji576rk4gfywl240cn6zgi7"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1869,10 +1895,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.10pre0.20230609.233956"; + version = "0.11pre0.20230708.75452"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.10pre0.20230609.233956.tar"; - sha256 = "110hj66w821fdb8fbqsmzxy4ypz14g55c6qvy6mkad39qbync1nw"; + url = "https://elpa.gnu.org/devel/ement-0.11pre0.20230708.75452.tar"; + sha256 = "0lzhw99lddipmz3272kckb01qzrl72414351wxrlnvx7h6py0kx2"; }; packageRequires = [ emacs @@ -1898,10 +1924,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "15.0.20230525.163835"; + version = "16.0.20230727.114320"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-15.0.20230525.163835.tar"; - sha256 = "084ax2gl1zjxr24sidnlmx1n7ra0myvmxzlicmwg49szl2majszp"; + url = "https://elpa.gnu.org/devel/emms-16.0.20230727.114320.tar"; + sha256 = "0zdy9wxdsxjsgm0vil0f87d21d9cdlgsbnh2d4sg58my0lnh37b6"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1967,10 +1993,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20230611.202407"; + version = "5.6snapshot0.20230722.73307"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20230611.202407.tar"; - sha256 = "195ywapyvw79x8mbs45dc9mkskwy7l3qvrinw0jw0lj081ql4n6d"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20230722.73307.tar"; + sha256 = "0r0w4275ssbmb40jnnyxdyykb38xl3lkrj9swfc60j22lzcwk2df"; }; packageRequires = [ compat emacs ]; meta = { @@ -2005,10 +2031,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "18.10.3snapshot0.20230419.152710"; + version = "18.10.3snapshot0.20230803.60048"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230419.152710.tar"; - sha256 = "04mbnx6mlkpkdh700x0xdfyw31idgypcmag2sdk29dgqza761b9r"; + url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230803.60048.tar"; + sha256 = "0glw3kgmk6c6iv7xlq9shh6w6y34pqnbma6a6j0jwd7fq0px7j8w"; }; packageRequires = [ emacs ]; meta = { @@ -2193,10 +2219,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.4.0.20230418.225726"; + version = "1.3.4.0.20230713.135815"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.4.0.20230418.225726.tar"; - sha256 = "1afzqxma730gdmbg6390v2bcm2mnpv8lbnjad4h1wvg95xg2c9ig"; + url = "https://elpa.gnu.org/devel/flymake-1.3.4.0.20230713.135815.tar"; + sha256 = "1fdlmb6pyp6j03gh10zzml4ljgr6zvdvyfshnvbvvcw2zrp028lh"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2564,10 +2590,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.1.0.20230317.61441"; + version = "0.1.0.20230731.130625"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.1.0.20230317.61441.tar"; - sha256 = "1s1lz80irpgr4d69l098wj8dbvmy3h14hfl28k51ng6q95hxyizl"; + url = "https://elpa.gnu.org/devel/greader-0.1.0.20230731.130625.tar"; + sha256 = "1imqwxyc76n7d1fmffbqvv7afppybwr6lzbzgsxcqzhn4gvrlkcd"; }; packageRequires = [ emacs ]; meta = { @@ -2750,10 +2776,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20230611.151720"; + version = "8.0.1pre0.20230803.213520"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230611.151720.tar"; - sha256 = "126kzbyky9qjp5lplygkxb53dxq3wis9b1pyl0xfhmvwipbs31s0"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230803.213520.tar"; + sha256 = "0j4yq47nk10q3lfsqr271ryq2r5j0n4nnclkvk5zrvv4abmv3v0b"; }; packageRequires = [ emacs ]; meta = { @@ -2849,10 +2875,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.0.0.20230410.182111"; + version = "0.14.0.0.20230714.75746"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.0.0.20230410.182111.tar"; - sha256 = "0dsx4z1afcnh4landah0srq6g4abdzm2khpa8nlvcfrgvfyzvhq1"; + url = "https://elpa.gnu.org/devel/ivy-0.14.0.0.20230714.75746.tar"; + sha256 = "166nysfapnz1b15dmag9hlfx26j0k882k5wmx7fpbm4mdj20y6q0"; }; packageRequires = [ emacs ]; meta = { @@ -2994,10 +3020,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.8.0.20230527.124738"; + version = "0.9.0.20230730.120017"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.8.0.20230527.124738.tar"; - sha256 = "1r1r4g1q96wzzwsfh89i779wm4kjvkci2aq59kf56xm514h5i9yh"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20230730.120017.tar"; + sha256 = "15wl22ias9rhihxzrf0m81hdxgpq3kc6v6mlp44cfdrx50mkm1r6"; }; packageRequires = [ compat emacs ]; meta = { @@ -3032,10 +3058,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20230408.0.20230509.224433"; + version = "20230408.0.20230628.23819"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20230408.0.20230509.224433.tar"; - sha256 = "1na5fzwqdmwhc3j7v5wijr3yqk2xiylgj1nsnn7j77hl5fm5j0m6"; + url = "https://elpa.gnu.org/devel/js2-mode-20230408.0.20230628.23819.tar"; + sha256 = "1yr3nyy28wwvmrbm3zl6hvwzja1qspvw92jzddydgjdws1xwwmfc"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3065,10 +3091,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.17.0.20230415.124337"; + version = "1.0.17.0.20230729.112319"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.17.0.20230415.124337.tar"; - sha256 = "0xg2998bpdp3z6w1jp64shkwvzynnasagdgmz8gddpb3mmcqymjm"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.17.0.20230729.112319.tar"; + sha256 = "0id8pih1svkp1ipnb92kh2avmb8cwrldxgj4b0kli4bi2q9i58x6"; }; packageRequires = [ emacs ]; meta = { @@ -3099,10 +3125,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0.0.20230506.135746"; + version = "0.2.0.0.20230805.145201"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230506.135746.tar"; - sha256 = "141gj4yln50d36pdr171h3ykhw1c7yspvcnv5rsicy1kygi9x8km"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230805.145201.tar"; + sha256 = "0calziv294vwbgqy7pjdnfhcgbx7x47129dhwnrdlim2xj5p4lj1"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3179,10 +3205,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.5.5.0.20221107.5633"; + version = "4.5.5.0.20230803.74443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20221107.5633.tar"; - sha256 = "1r76jfd0z771dllxqzgrg5z0vli3y3516frdjrlcc1mprj35dml5"; + url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar"; + sha256 = "1ixyiy2zq3v0vz1jbazba41x3m3azb6zvpjm0721dakkqv8k7idj"; }; packageRequires = [ emacs ]; meta = { @@ -3227,10 +3253,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "1.0.0.0.20230120.90459"; + version = "1.0.0.0.20230617.191618"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20230120.90459.tar"; - sha256 = "1f7xgw4dvjhrkd3cgb0v20272ah2bdhlnmqhlcjbkw67wan8arrv"; + url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20230617.191618.tar"; + sha256 = "1q3gz7i83v5v6y5plf8z1llq9r6bdjaj1ml6vl70z3jribrib8ga"; }; packageRequires = [ emacs ]; meta = { @@ -3324,10 +3350,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.0.1.0.20230326.52119"; + version = "1.1.1.0.20230621.190031"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.0.1.0.20230326.52119.tar"; - sha256 = "1a6hdlm738kfwd6h5hysxmj29yyigb1xin778431pd0jrznf1rva"; + url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20230621.190031.tar"; + sha256 = "10bbjidfma7xsmh1gmv6qfnv315r9bvbik0hqdx9kd75sl7fvdj7"; }; packageRequires = [ emacs ]; meta = { @@ -3369,10 +3395,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20230101.53112"; + version = "3.3.1.0.20230730.132027"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230101.53112.tar"; - sha256 = "0a2b95svxzd73n70s9pabjnqvyjz9mqc26rndvf030g54m7c3j8a"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230730.132027.tar"; + sha256 = "07mwm2y6h9q2c8058s1wg752rsi4hqpg2wr9apigvldli5fdwn72"; }; packageRequires = [ emacs ]; meta = { @@ -3388,10 +3414,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.2.0.20230527.102116"; + version = "1.3.0.20230805.91509"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.2.0.20230527.102116.tar"; - sha256 = "1qaw7yszshnjafljbfx8vi3417mwz47rhx17h0py2nzc07fbc1dl"; + url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20230805.91509.tar"; + sha256 = "1xxx64vfx6i2ghnhk79fm33mqlmg8y1jjl9365wgsq51f5422041"; }; packageRequires = [ compat emacs ]; meta = { @@ -3586,10 +3612,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.2.0.0.20230610.24325"; + version = "4.2.0.0.20230804.93355"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230610.24325.tar"; - sha256 = "1860kl7wmd29qr7yk84pr08j9snhh2r5hh6m1hi1k64wz974f091"; + url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230804.93355.tar"; + sha256 = "1vw5jfkwmn2xccvkqrfxd7glgrgm43va8fjb57wf2kqcy3hfk7dv"; }; packageRequires = [ emacs ]; meta = { @@ -3740,10 +3766,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.0.0.20230603.175642"; + version = "1.0.1.0.20230712.92019"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.0.0.0.20230603.175642.tar"; - sha256 = "11wjf5rda157h60m5v2dhmigc91jr043x76g49fyzmk2v60ilrak"; + url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20230712.92019.tar"; + sha256 = "10zq3zm8yv5gmi9kgw742zb52swzi09c4npvqjh31hmrzprvp4nn"; }; packageRequires = [ emacs ]; meta = { @@ -3844,10 +3870,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "0.2.2.0.20230101.153332"; + version = "1.0.1.0.20230801.130142"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-0.2.2.0.20230101.153332.tar"; - sha256 = "1rh3gqq5ihcvpslykqdx32g6l2dlxyj86i7q1kjanhjc6yirbc37"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.0.1.0.20230801.130142.tar"; + sha256 = "0c3iwgfaw4qy8a7s86nn82lqv1bw3cypmnr1bmyz4iyjdwfzb8xd"; }; packageRequires = [ emacs ]; meta = { @@ -3988,10 +4014,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20230219.104813"; + version = "1.0.0.20230801.201828"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230219.104813.tar"; - sha256 = "00il7zsahys2c53zr77rbnq18lffhpp3fhg8k09pc9zhx5b1arpn"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230801.201828.tar"; + sha256 = "1yn7rs9i2x75pv0nvwhm4dwrp7zj6lxgw8k516pari864ksk06zh"; }; packageRequires = [ emacs ]; meta = { @@ -4003,10 +4029,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20230613.100848"; + version = "9.7pre0.20230806.72218"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20230613.100848.tar"; - sha256 = "164ndywr9rgls1yzn1p1gkmszqr3rqzd10k9rjqairvsl2i1r68w"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20230806.72218.tar"; + sha256 = "11hk2zc3013i3dzqpgw2apbg6hb96kc1zbwnngnf3ld0fwaw5g0j"; }; packageRequires = [ emacs ]; meta = { @@ -4061,10 +4087,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.9.0.20230604.100249"; + version = "0.10.0.20230702.80510"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-0.9.0.20230604.100249.tar"; - sha256 = "0f7qnkh1cj4hmgxg6l7vmqq3fcck2shaszbfk86m94why3agh708"; + url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20230702.80510.tar"; + sha256 = "0jja7d7kk5ns5i5m617zqzvk2n4sxq4q323wgrzng50g2h4w505a"; }; packageRequires = [ compat emacs ]; meta = { @@ -4118,10 +4144,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.1.0.0.20230520.73005"; + version = "1.1.0.0.20230731.204715"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.1.0.0.20230520.73005.tar"; - sha256 = "1vq1wb4z0csrxysvv1k0ysj81v53c0ayyc49xvigjadn53v9rqdr"; + url = "https://elpa.gnu.org/devel/org-remark-1.1.0.0.20230731.204715.tar"; + sha256 = "0pfy42rhg4cfm55j2dlbs2dc5j6gbs7xi91nx8qcmjm57mipq53i"; }; packageRequires = [ emacs org ]; meta = { @@ -4137,10 +4163,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2.0.20230524.192243"; + version = "1.3.2.0.20230623.103407"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230524.192243.tar"; - sha256 = "0kw1kwgrsv5xbj3qkhqp11gh0w7q8p347frg6cqm8wsyp49psl9r"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230623.103407.tar"; + sha256 = "121bds4h53ynpz7yyjws3j75rl7xhisminv4xx03nqj9ggv1w28i"; }; packageRequires = [ emacs org ]; meta = { @@ -4201,10 +4227,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.12.0.20230518.153430"; + version = "0.13.0.20230703.182804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-0.12.0.20230518.153430.tar"; - sha256 = "1fyzahk86lhzb6j8p1996364j3a66pg54q655ifvd124pij6xbi9"; + url = "https://elpa.gnu.org/devel/osm-0.13.0.20230703.182804.tar"; + sha256 = "0ypi2qar9a502wd48pag61v7fhay14f3dabb51rwg7xx7mza18j4"; }; packageRequires = [ compat emacs ]; meta = { @@ -4345,14 +4371,17 @@ license = lib.licenses.free; }; }) {}; - perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + perl-doc = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "perl-doc"; ename = "perl-doc"; - version = "0.6.0.20220929.155443"; + version = "0.81.0.20230805.210315"; src = fetchurl { - url = "https://elpa.gnu.org/devel/perl-doc-0.6.0.20220929.155443.tar"; - sha256 = "0sz036kvymq14ph03gqkzxmz4r64b8g44phx7bmz70w803w9rpxd"; + url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar"; + sha256 = "0p4vryw3by2g9kqmmdn6vi01cqgj5pwgfjcimivcxvq7vzvdafz0"; }; packageRequires = [ emacs ]; meta = { @@ -4412,10 +4441,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.6pre0.20230530.113949"; + version = "0.8pre0.20230709.214633"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.6pre0.20230530.113949.tar"; - sha256 = "1k96pibm5c5sl6b8cw5w4n8x33dhf1zc8ik64y0m03sj70h20j9l"; + url = "https://elpa.gnu.org/devel/plz-0.8pre0.20230709.214633.tar"; + sha256 = "1gzwzqjr0rkpcqbjfadn3rhj01ar6m66xws8cvlvjm8qfb5j4740"; }; packageRequires = [ emacs ]; meta = { @@ -4495,10 +4524,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.2.0.20230601.152949"; + version = "1.4.2.0.20230714.22752"; src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.4.2.0.20230601.152949.tar"; - sha256 = "02s06gn7s2idf372p62gn7zbkg9az52wgrbd8zkd8fjc2q7mh5bc"; + url = "https://elpa.gnu.org/devel/posframe-1.4.2.0.20230714.22752.tar"; + sha256 = "0v3g4z36gm87z4ar7r4q86alscl6r64wd7y3wf55ngbhb84fh02r"; }; packageRequires = [ emacs ]; meta = { @@ -4538,14 +4567,18 @@ license = lib.licenses.free; }; }) {}; - project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }: + project = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , xref }: elpaBuild { pname = "project"; ename = "project"; - version = "0.9.8.0.20230603.55058"; + version = "0.9.8.0.20230805.161830"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.9.8.0.20230603.55058.tar"; - sha256 = "0bb31z07i9vd5w2j5bv93hzv7c4ahc484v9334n50zlqfphapvzy"; + url = "https://elpa.gnu.org/devel/project-0.9.8.0.20230805.161830.tar"; + sha256 = "0cihdjw17jjjqw13ngsa1n5vjpvic4m3ra42x0x7nizv702ad0cx"; }; packageRequires = [ emacs xref ]; meta = { @@ -4587,10 +4620,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.5.0.0.20230306.95333"; + version = "0.5.0.0.20230802.115005"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-0.5.0.0.20230306.95333.tar"; - sha256 = "1m6fws539lp8852aj40kl0cwsr1madg41l1clirgrxv8bsvkc9vd"; + url = "https://elpa.gnu.org/devel/pulsar-0.5.0.0.20230802.115005.tar"; + sha256 = "17ykmwwy364m8xvbjgavi9s9nlqysjwgvfbavjrr7c6ga7lm16ha"; }; packageRequires = [ emacs ]; meta = { @@ -4634,10 +4667,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20230603.55058"; + version = "0.28.0.20230804.122126"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20230603.55058.tar"; - sha256 = "083l5b0vppdi6pjkb2hh1wa12ja0z0ndqjzn4a7pry118xbjp4vz"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20230804.122126.tar"; + sha256 = "0wvjdsmxajz9dl7mnj0m2hqs0ln8s98gp3h1b60bpz18fww2r90y"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -4754,10 +4787,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.1.0.20220818.135039"; + version = "1.5.1.0.20230704.91526"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20220818.135039.tar"; - sha256 = "0sazlcbwmdyn4g8lyak0bl44nq8qkr2qajdnr9xd4dqkhvz9w4gd"; + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20230704.91526.tar"; + sha256 = "1cjpil5zdxwskw1r1in3w2zwqy9gyidz0wppzpxnfpfvk79vyf16"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -4946,10 +4979,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.22.0.20230612.102749"; + version = "1.23.0.20230801.104158"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.22.0.20230612.102749.tar"; - sha256 = "08q5y03lf9r5an6sw4gw6fkn0vcy0yhy43bfx1pag8d55x1h42ny"; + url = "https://elpa.gnu.org/devel/relint-1.23.0.20230801.104158.tar"; + sha256 = "0hkkvcrir5abar89gz2zqckpnnfr3v5l0in8d0nfqphfin30xwid"; }; packageRequires = [ emacs xr ]; meta = { @@ -5114,10 +5147,10 @@ elpaBuild { pname = "sed-mode"; ename = "sed-mode"; - version = "1.0.0.20221221.82014"; + version = "1.1.0.20230721.154631"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sed-mode-1.0.0.20221221.82014.tar"; - sha256 = "1c2wdqazxwlllihyyhikzf1zrr0a12pmn789mwjchfv1y6r5iq55"; + url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar"; + sha256 = "1mp4xyca7g29vn5c7dl3dw3ng9n5kiryvdgrmqrha13ppyqqzd5x"; }; packageRequires = []; meta = { @@ -5548,10 +5581,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.14.0.20230129.90300"; + version = "3.1.16.0.20230702.92809"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.14.0.20230129.90300.tar"; - sha256 = "1184y9kc1x0jj8llz0hf0ysq64sxjhrdpikjl32gs7iilvpj950m"; + url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar"; + sha256 = "1kbwvfkz74q8qfk6735hhi1mwdijvgrhqvwjfnfv8x8sr73yldkp"; }; packageRequires = [ emacs ]; meta = { @@ -5599,10 +5632,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.1.8.0.20230409.85458"; + version = "0.2.1.0.20230704.110210"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.1.8.0.20230409.85458.tar"; - sha256 = "1yrpkhbf0msa9pvhwwkcj49p9zk044872q1ifrnsr9av60klwfhv"; + url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20230704.110210.tar"; + sha256 = "0r3fwndzgz1xl0r607mnvjjmw5g1cf7qg2gvwsyrzdn6hrs786zj"; }; packageRequires = [ emacs ]; meta = { @@ -5640,14 +5673,17 @@ license = lib.licenses.free; }; }) {}; - svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + svg-lib = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.6.0.20230403.73919"; + version = "0.2.7.0.20230619.143402"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-lib-0.2.6.0.20230403.73919.tar"; - sha256 = "0x88al3kpjvcala6p5wqg98kjich2q9gd3q63h2h8126y6al7kn5"; + url = "https://elpa.gnu.org/devel/svg-lib-0.2.7.0.20230619.143402.tar"; + sha256 = "1h4knhasimf496qhlvm132cghpam303vl9mbdg4p3ld5jcd6ghz5"; }; packageRequires = [ emacs ]; meta = { @@ -5663,10 +5699,10 @@ elpaBuild { pname = "svg-tag-mode"; ename = "svg-tag-mode"; - version = "0.3.2.0.20230110.182450"; + version = "0.3.2.0.20230803.50443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230110.182450.tar"; - sha256 = "0ym02nj3c2ca2dfkj5jyvzc1bq1ymhg5nq8r9rnjxh73y6069knw"; + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230803.50443.tar"; + sha256 = "1973scw129mx9v7z1ms2ai56ljj5slpckv80vxl3jjlgmjxxzg61"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -5737,10 +5773,10 @@ elpaBuild { pname = "system-packages"; ename = "system-packages"; - version = "1.0.11.0.20220409.62318"; + version = "1.0.12.0.20230805.22742"; src = fetchurl { - url = "https://elpa.gnu.org/devel/system-packages-1.0.11.0.20220409.62318.tar"; - sha256 = "0lljns53xvn1mns5vx4fmckydrgv4kqy6cfj9svkvq81bya1smdc"; + url = "https://elpa.gnu.org/devel/system-packages-1.0.12.0.20230805.22742.tar"; + sha256 = "08y4iclq1gapp8xcdnx9znyxjjj1msv9kac87r3fi2vis3kyhn5n"; }; packageRequires = [ emacs ]; meta = { @@ -5835,10 +5871,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.7.0.20230606.80030"; + version = "0.8.0.20230801.91019"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.7.0.20230606.80030.tar"; - sha256 = "0p2x5ba37a6f37m0bfs2a02hp8c81rs4f8q6v35n4r3652kbw7pm"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230801.91019.tar"; + sha256 = "0c4srhrb6pak34xqni0dxgi9n3la8avd0y9hgfb0n1xyzyh03v0v"; }; packageRequires = [ compat emacs ]; meta = { @@ -5950,10 +5986,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.0.5.0.20230530.81440"; + version = "2.6.1.1.0.20230730.64606"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.0.5.0.20230530.81440.tar"; - sha256 = "0nhw6aicnvih8mwwn1gfnpcbypw0kmgkn2sggkh1clrf291bibqw"; + url = "https://elpa.gnu.org/devel/tramp-2.6.1.1.0.20230730.64606.tar"; + sha256 = "1vwwqf6q54cdysxbw4hqhcs3izmlzydb3k11q4x99j626rllj5nf"; }; packageRequires = [ emacs ]; meta = { @@ -6093,10 +6129,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.2.0.20230613.212718"; + version = "0.3.4.0.20230726.211145"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.3.2.0.20230613.212718.tar"; - sha256 = "0c5kv3phzxf56v7gzgarpymj2y8qz9y2f9bzy7fxifg4921y02np"; + url = "https://elpa.gnu.org/devel/triples-0.3.4.0.20230726.211145.tar"; + sha256 = "0v477ja1jw8mdz5hq86p2aqlj8nmavidw02j9fj0xahv8cvcmjm7"; }; packageRequires = [ emacs seq ]; meta = { @@ -6108,10 +6144,10 @@ elpaBuild { pname = "typo"; ename = "typo"; - version = "1.0.1.0.20230527.83048"; + version = "1.0.1.0.20230725.200324"; src = fetchurl { - url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230527.83048.tar"; - sha256 = "12flvb976krxxidb8jlkrkfq0nm57gfwcsczjk5slxvwyjf4hvi8"; + url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230725.200324.tar"; + sha256 = "01280xwdm1n0x1n4avhy0zh6xl8dhxvzskhdarknszqz6yhxrc9x"; }; packageRequires = [ emacs ]; meta = { @@ -6200,10 +6236,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.2.0snapshot0.20230610.165543"; + version = "0.2.0snapshot0.20230804.235827"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.2.0snapshot0.20230610.165543.tar"; - sha256 = "09j6wkr77xl87jjpjs9msjad1fmdag77dkqgz1ad3z5f02sav0nn"; + url = "https://elpa.gnu.org/devel/urgrep-0.2.0snapshot0.20230804.235827.tar"; + sha256 = "0vlci7z2kpvrzlzlpfga0n3hbldqsi4whk73m6m3l8p8zxcidyca"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6372,10 +6408,10 @@ elpaBuild { pname = "vcard"; ename = "vcard"; - version = "0.2.2.0.20221212.230951"; + version = "0.2.2.0.20230718.145809"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20221212.230951.tar"; - sha256 = "10m83a0vwjbv2jbdyhyzndc6vlaa7jm47310w7jiqz4r49835p6j"; + url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar"; + sha256 = "0b3pxl03kjdyi70hnnf5sb2jvrkhnk0srsn2gr555y9kfbgzwwj1"; }; packageRequires = [ emacs ]; meta = { @@ -6402,10 +6438,10 @@ elpaBuild { pname = "vdiff"; ename = "vdiff"; - version = "0.2.4.0.20220830.105050"; + version = "0.2.4.0.20230620.220116"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20220830.105050.tar"; - sha256 = "1q2jy95mdlk8cd66bbpzmqx1bgip8wr0zslgxrz6cgjcjaszpwra"; + url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar"; + sha256 = "17767yyim333xwgzn3kb2l58z1w4wh55s45a5y1jv12ilfi08cnq"; }; packageRequires = [ emacs hydra ]; meta = { @@ -6434,10 +6470,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.3.0.20230522.143108"; + version = "1.4.0.20230725.200356"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.3.0.20230522.143108.tar"; - sha256 = "1nignd2xf7xsz01jc36bv0pa3r97xavgjivk532qyy2w0dqwg281"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20230725.200356.tar"; + sha256 = "0csc1mdq1adzhncv7nnsi2jmnv4v994v8x0kxyr07axc069kh8hi"; }; packageRequires = [ compat emacs ]; meta = { @@ -6534,10 +6570,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.1.0.0.20230612.40515"; + version = "2.1.0.0.20230619.221715"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230612.40515.tar"; - sha256 = "1dbzf9dnvyjikn5z256yrqy5i215vxby3ndg7i0i0pdzg3pjkj39"; + url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230619.221715.tar"; + sha256 = "1vl1wfk68fy9jcr8dm673g8qbf5ax557fpb5wwpijffrsyss9qzk"; }; packageRequires = [ emacs ]; meta = { @@ -6621,10 +6657,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.14.0.20230304.231043"; + version = "1.14.0.20230730.11730"; src = fetchurl { - url = "https://elpa.gnu.org/devel/websocket-1.14.0.20230304.231043.tar"; - sha256 = "03m3r7xsyhkz3zh84p4dkr6xn77ld8gdqpm6gjvcd4gfrs9i75wz"; + url = "https://elpa.gnu.org/devel/websocket-1.14.0.20230730.11730.tar"; + sha256 = "0184cjiqprf7g03kzl57623ww4jbv1pjb786gx3n25lcsv08iryr"; }; packageRequires = [ cl-lib ]; meta = { @@ -6639,10 +6675,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.0.0.20230606.182727"; + version = "3.6.0.0.20230712.175108"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20230606.182727.tar"; - sha256 = "0r8r1y82vsxcpf6rck7ay0hksrm1cyxczyhz7dlnnja9sdr4wsfx"; + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20230712.175108.tar"; + sha256 = "1m28fq9swmzwh5vqhg79zjwis6yxyjc3z48xp0m1m97aw2r63n33"; }; packageRequires = [ emacs ]; meta = { @@ -6650,6 +6686,24 @@ license = lib.licenses.free; }; }) {}; + window-commander = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "window-commander"; + ename = "window-commander"; + version = "3.0.2.0.20230630.142949"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20230630.142949.tar"; + sha256 = "0sr29bslv9b2avsb6s0ln7j19zbrfvk2xbxgylxi3r43nhm4lmy5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-commander.html"; + license = lib.licenses.free; + }; + }) {}; windower = callPackage ({ elpaBuild , emacs , fetchurl @@ -6754,10 +6808,10 @@ elpaBuild { pname = "xeft"; ename = "xeft"; - version = "3.3.0.20230322.153950"; + version = "3.3.0.20230724.143339"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230322.153950.tar"; - sha256 = "0bnapb3kpyjlclysbs43003dzc7b2p80iqkxk42iqpwm2xyg9s8q"; + url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230724.143339.tar"; + sha256 = "1q440lab148nwvvix29iyzjmknf243wam9cqsfz0vk1az7rp7pmb"; }; packageRequires = [ emacs ]; meta = { @@ -6799,10 +6853,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.23.0.20230326.142354"; + version = "1.24.0.20230801.101425"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.23.0.20230326.142354.tar"; - sha256 = "0mxn1znp0f2v7xkaflska3v05sicx7ajshkvwczmcrnaizd5895z"; + url = "https://elpa.gnu.org/devel/xr-1.24.0.20230801.101425.tar"; + sha256 = "0dzwvbs62z07fyni4xh73wd1s2ipvrhcvid3cqs7m86kwgbh3g41"; }; packageRequires = [ emacs ]; meta = { @@ -6900,10 +6954,10 @@ elpaBuild { pname = "ztree"; ename = "ztree"; - version = "1.0.6.0.20210415.194722"; + version = "1.0.6.0.20230617.194317"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20210415.194722.tar"; - sha256 = "1jcvzj0pwk4rwgp0xgzd2qlcgx0x3kg8843qsyr5banmphnmfma8"; + url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar"; + sha256 = "1sgii6lf06dqhld67vhac1319nbjrrd9npm2z8aysxg6hs26hfab"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 4459b451f8a69..dc8faedcbc87e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -265,10 +265,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.0"; + version = "13.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.2.0.tar"; - sha256 = "1jk05cca7lrwykj3by4s7c198bffam0mga7hgwmcz5bgxl79ijvf"; + url = "https://elpa.gnu.org/packages/auctex-13.2.1.tar"; + sha256 = "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm"; }; packageRequires = [ emacs ]; meta = { @@ -565,6 +565,21 @@ license = lib.licenses.free; }; }) {}; + buildbot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "buildbot"; + ename = "buildbot"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar"; + sha256 = "0glvybvjgwbx3dnr09w9y65v2ic080a4zhs88893amvfw29ig4lx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buildbot.html"; + license = lib.licenses.free; + }; + }) {}; calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "calibre"; @@ -584,10 +599,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.15.tar"; - sha256 = "1gy99a7zg8kbh7f4fqqq7cpwjmq7af066m6z6c1wrv438sfsd3kz"; + url = "https://elpa.gnu.org/packages/cape-0.16.tar"; + sha256 = "1l9zw71dl5g3q9iysd64l27id63w3klqy9dzc1fn1q6y5gsf8bl4"; }; packageRequires = [ compat emacs ]; meta = { @@ -832,10 +847,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.1"; + version = "29.1.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.1.tar"; - sha256 = "1r8laxmdyrpz4nmzjrndd668bks4fgmbya04m0bfzwvhlrsca940"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.2.tar"; + sha256 = "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g"; }; packageRequires = [ emacs seq ]; meta = { @@ -847,10 +862,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.34.tar"; - sha256 = "12dljbs0x5gbayibzb0mb3bn78wlfx9078b8l0fyfpvbhd9lxhfl"; + url = "https://elpa.gnu.org/packages/consult-0.35.tar"; + sha256 = "00rw4d9k16wx55pk7fyj4z718vmqjq18jy0xiv7izzkdkkkk3l7p"; }; packageRequires = [ compat emacs ]; meta = { @@ -892,10 +907,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.36.tar"; - sha256 = "15ysg54rallbdx6la8q8yjdj9rag91wkga8agrwf0xh7pp3nij9d"; + url = "https://elpa.gnu.org/packages/corfu-0.37.tar"; + sha256 = "0r5c8960nxfdn0kc0x7v0sla0mqids54s5xw9rj6818w1vk9r7g7"; }; packageRequires = [ compat emacs ]; meta = { @@ -1027,10 +1042,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-1.0.0.tar"; - sha256 = "08mh6564xr4dni53dm7m4jz8cf8v6i99xnrxyp76zvaa809zc5q3"; + url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar"; + sha256 = "0m6q7x5144l2q582gdaqgirvgy30ljd1qyjf82l3v1jkc5qf9wfr"; }; packageRequires = [ emacs ]; meta = { @@ -1102,10 +1117,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.35"; + version = "0.36"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.35.tar"; - sha256 = "1w6y02ikjshfk12sdgbryfgj2z4yia2mpifa7g13ab7v9phpqpl1"; + url = "https://elpa.gnu.org/packages/debbugs-0.36.tar"; + sha256 = "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1132,10 +1147,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-1.2.0.tar"; - sha256 = "09xbyh22xll82ywqmlbsvqhxlqawfivaqydha0gs5qc4yn71kp0k"; + url = "https://elpa.gnu.org/packages/denote-2.0.0.tar"; + sha256 = "1wrfbirkzf9szss1rgpmgdr0gy2dvhnbzlnyhw3sp2jvw5sb1xz9"; }; packageRequires = [ emacs ]; meta = { @@ -1278,6 +1293,21 @@ license = lib.licenses.free; }; }) {}; + dired-preview = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-preview"; + ename = "dired-preview"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-preview-0.1.1.tar"; + sha256 = "1qmrh0sd9s908xkxz5vfhq956ynrx6k2bx8lddmdp8ci8xkw6wmh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-preview.html"; + license = lib.licenses.free; + }; + }) {}; disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "disk-usage"; @@ -1477,10 +1507,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.1.1.tar"; - sha256 = "0yd3m9az0kdv73wx2vbvv0zmlknnc929ldyxnf78w81r5hd4vn7c"; + url = "https://elpa.gnu.org/packages/ef-themes-1.2.0.tar"; + sha256 = "1s4kw4y8k66x76j6c03gr2my2s95ymdjxwh01lzhyy5xkggikqfj"; }; packageRequires = [ emacs ]; meta = { @@ -1602,6 +1632,21 @@ license = lib.licenses.free; }; }) {}; + emacs-gc-stats = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "emacs-gc-stats"; + ename = "emacs-gc-stats"; + version = "1.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.1.tar"; + sha256 = "0k7vng4ikcgb3s9qwjxfyjaq4s45n9r2m9hhnvi953gh3q4xdyck"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html"; + license = lib.licenses.free; + }; + }) {}; embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "embark"; @@ -1651,10 +1696,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.9.3"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.9.3.tar"; - sha256 = "0pqxq2pqj5hjd2fg403y05x99i6x666vk2z2jbm3ipxwnp4krppw"; + url = "https://elpa.gnu.org/packages/ement-0.10.tar"; + sha256 = "0iw4vk99h15zhq507praqqar9sc5yyk5hbckygbr4x6af88jc02i"; }; packageRequires = [ emacs @@ -1680,10 +1725,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "15"; + version = "16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-15.tar"; - sha256 = "0kd9qx93cgcxyqsnbp95xx414s08rd5bb35aif3c7qyab5w05yi6"; + url = "https://elpa.gnu.org/packages/emms-16.tar"; + sha256 = "1c18lrrfg1n5vn1av9p7q3jys27pdmxq8pq5gqb6397jnv9xywby"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2664,10 +2709,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-0.8.tar"; - sha256 = "19dgp312jvpy3k0xq0r033jfhnyrl8xfv3q2djwv9s7883483srn"; + url = "https://elpa.gnu.org/packages/jinx-0.9.tar"; + sha256 = "0q9g3agql5gm95r64lpcwcs9scwhmwcjjnkiykzxdzpnkjn0mjgb"; }; packageRequires = [ compat emacs ]; meta = { @@ -2969,10 +3014,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-1.0.1.tar"; - sha256 = "1kmfsgapinx6p8zyxd2s81j703iiril9c907r576z5k498pfifb6"; + url = "https://elpa.gnu.org/packages/logos-1.1.1.tar"; + sha256 = "1lg4disxfzw9nf438j32q1cna447mlxy3sg523cqzhimh1mk5s9f"; }; packageRequires = [ emacs ]; meta = { @@ -3029,10 +3074,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.2.tar"; - sha256 = "1hhq09ghc8pcphgjhp5mc81i7j4xkkf5sc0swd6xr6mrxd044fnj"; + url = "https://elpa.gnu.org/packages/marginalia-1.3.tar"; + sha256 = "14wk3ld9zaj05dmsyhq70kdl0h4bk4gl6sn7x5cckq3av78idh39"; }; packageRequires = [ compat emacs ]; meta = { @@ -3349,10 +3394,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-1.0.0.tar"; - sha256 = "0fg4s3ydmb769mnyx3ngx7rp5g8pmm91rqwng05jb8sgn0sfmsni"; + url = "https://elpa.gnu.org/packages/nano-modeline-1.0.1.tar"; + sha256 = "1bjxsqbi540cx2zxzrps2bdwj3hkaxw1s9wha1lrldhvckq7dm91"; }; packageRequires = [ emacs ]; meta = { @@ -3443,10 +3488,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "0.2.2"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/notmuch-indicator-0.2.2.tar"; - sha256 = "1jca5zm8vd91ivk5c6n2210ybp1i8rb8cpi1dymbxkcjxc61fzgp"; + url = "https://elpa.gnu.org/packages/notmuch-indicator-1.0.1.tar"; + sha256 = "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x"; }; packageRequires = [ emacs ]; meta = { @@ -3593,10 +3638,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.6"; + version = "9.6.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.6.tar"; - sha256 = "00xp2v0crg5ls79a9waapymr8rrv00gpff3ihm3w8mr3f6dyypn9"; + url = "https://elpa.gnu.org/packages/org-9.6.7.tar"; + sha256 = "1wj9sj9ybfkwsk6chxs4pk7fxmnw3r6ai9xj9rr0wrvk0771350c"; }; packageRequires = [ emacs ]; meta = { @@ -3638,10 +3683,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.9"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-0.9.tar"; - sha256 = "1aq02w1mbqfx370d18a21w6jhnwad55v73yhlvqyghkh1xdi3h0j"; + url = "https://elpa.gnu.org/packages/org-modern-0.10.tar"; + sha256 = "0y17n6ac1b8rsa91qbisagp5mpmpnlni3j78x55z5dnpbi31yn1l"; }; packageRequires = [ compat emacs ]; meta = { @@ -3758,10 +3803,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.12.tar"; - sha256 = "1i94ymji0kknrf8p49vghs7s9f16skp5vsxayj1dy52gkvfh273j"; + url = "https://elpa.gnu.org/packages/osm-0.13.tar"; + sha256 = "13bdp8cz1w396vdfxvv8ygla7cbln178rjliknhfl3kqggg32kqx"; }; packageRequires = [ compat emacs ]; meta = { @@ -3878,10 +3923,10 @@ elpaBuild { pname = "perl-doc"; ename = "perl-doc"; - version = "0.6"; + version = "0.81"; src = fetchurl { - url = "https://elpa.gnu.org/packages/perl-doc-0.6.tar"; - sha256 = "0xmk09pfvdzkrjfsa2l78bd6akcbdhcbnpvwnm6r83h65gpld79f"; + url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar"; + sha256 = "1hbf36zrpjx0xx257370axxfs1yb3iz6g9kc4wg83gcag09j3lci"; }; packageRequires = [ emacs ]; meta = { @@ -3938,10 +3983,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.5.4"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.5.4.tar"; - sha256 = "0dmjza49135x3baczk6q0lv9ib8lvfkdbbw4ps5hkr45wfxr64vc"; + url = "https://elpa.gnu.org/packages/plz-0.7.tar"; + sha256 = "00xm6hp51m4cmlw15qgqrspwgs3d9z1hw9pbpva9sa4v7vsbipd2"; }; packageRequires = [ emacs ]; meta = { @@ -4403,10 +4448,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.22.tar"; - sha256 = "1525hk961q4af06c5a60m7ryp5g8yvfxjp5nmmgkci7vl3ing8zi"; + url = "https://elpa.gnu.org/packages/relint-1.23.tar"; + sha256 = "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9"; }; packageRequires = [ emacs xr ]; meta = { @@ -4559,10 +4604,10 @@ elpaBuild { pname = "sed-mode"; ename = "sed-mode"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sed-mode-1.0.el"; - sha256 = "1zpdai5k9zhy5hw0a5zx7qv3rcf8cn29hncfjnhk9k6sjq0302lg"; + url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar"; + sha256 = "1vpfzr95xfvjiq7x1pkhjm96936yzsy9bzm1v8p3hyr486bar0mp"; }; packageRequires = []; meta = { @@ -4923,10 +4968,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.14"; + version = "3.1.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.14.tar"; - sha256 = "079g5g3640hyqdikszkz8kmfqdnqdbkl8rwd6k3kkck39ng63zy6"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar"; + sha256 = "0ajmsg4r9yba2m9wn08dsdzl8pr3pjixyqqp263mpwsh02h8im2g"; }; packageRequires = [ emacs ]; meta = { @@ -4968,10 +5013,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.1.8"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/substitute-0.1.8.tar"; - sha256 = "1xa1ny4iblifrylxkj2i99vnayrxh669dlbpcbk4rb7alvv1npnz"; + url = "https://elpa.gnu.org/packages/substitute-0.2.1.tar"; + sha256 = "1p9lhgi4y224aghwnnjxm14da461pj0ym4a7asla02hf33y61i5j"; }; packageRequires = [ emacs ]; meta = { @@ -5013,10 +5058,10 @@ elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-lib-0.2.6.tar"; - sha256 = "121wnk9g1dbpkx2w7di5f5czvv17wf67sacqpfpn53185z6mwwf3"; + url = "https://elpa.gnu.org/packages/svg-lib-0.2.7.tar"; + sha256 = "0vq7a1hh6am5a1hqc1fay4cra7944zch5m5vadwhsnqgnrylm2gw"; }; packageRequires = [ emacs ]; meta = { @@ -5088,10 +5133,10 @@ elpaBuild { pname = "system-packages"; ename = "system-packages"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/system-packages-1.0.11.tar"; - sha256 = "0xf2q5bslxpw0wycgi2k983lnfpw182rgdzq0f99f64kb7ifns9y"; + url = "https://elpa.gnu.org/packages/system-packages-1.0.12.tar"; + sha256 = "1q962z0lbdz7qw60lbhzqs8cqc66rhvsyjghy6rs7iqmq6h2sf8c"; }; packageRequires = [ emacs ]; meta = { @@ -5168,10 +5213,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.7.tar"; - sha256 = "05yhsrricaxlz67w1j0s1gbzpbsw4iqryfvks25v25pm95xrr7c4"; + url = "https://elpa.gnu.org/packages/tempel-0.8.tar"; + sha256 = "1ppvkwy7c31p4ibshfralwz02xnxmssf6lgikahpimrg928zcd80"; }; packageRequires = [ compat emacs ]; meta = { @@ -5277,10 +5322,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.0.5"; + version = "2.6.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.0.5.tar"; - sha256 = "0hbrrlcyhxkmjym4wnwipi47lzqpnlxc833p0hmghc6n0s8sx7hf"; + url = "https://elpa.gnu.org/packages/tramp-2.6.1.1.tar"; + sha256 = "0bjj4r46jgrh72p5fxyv0h0r7cx6x0l3abfcyj91hmyfgifkc5cv"; }; packageRequires = [ emacs ]; meta = { @@ -5397,10 +5442,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.3.tar"; - sha256 = "0qzyhsv50qpnys28vksdv404fq6jkdd1733c21lsz15g04kaj9nf"; + url = "https://elpa.gnu.org/packages/triples-0.3.4.tar"; + sha256 = "1y0qqa51iaj62yishyl3j2j9s2p1wzg6yasq417ls3x4rdccji0g"; }; packageRequires = [ emacs seq ]; meta = { @@ -5708,10 +5753,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.3.tar"; - sha256 = "192ljdvzyyjs9i3r3zimzarwpakibdrl036pdk60qmg4kyh057ms"; + url = "https://elpa.gnu.org/packages/vertico-1.4.tar"; + sha256 = "0jv4adwi18j14yjasqndsgyxgrd1jnjhwrw90hyplfii08f6gmdq"; }; packageRequires = [ compat emacs ]; meta = { @@ -5907,6 +5952,21 @@ license = lib.licenses.free; }; }) {}; + window-commander = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "window-commander"; + ename = "window-commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar"; + sha256 = "1v85g89rz8r2ypw6651lrb9mvrimdwhxan7kxzhpgam2i2g7kcr7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-commander.html"; + license = lib.licenses.free; + }; + }) {}; windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "windower"; @@ -6051,10 +6111,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.23"; + version = "1.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.23.tar"; - sha256 = "1nz3fhd4qx8fxib78y41jvnzn27lf7mlvpkz565d5zc9q4mr300z"; + url = "https://elpa.gnu.org/packages/xr-1.24.tar"; + sha256 = "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index b15ddb67dbd49..e1ad9b64093a9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.0.0.tar"; - sha256 = "0lahs00abcwjzjqz8238bcmsb25l0r3rj6zycsw7xjkz913sin7y"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.0.1.tar"; + sha256 = "1z7s75xcjnkvn7ik7cqylf5c2cih372k1rg4wwxkz3f217d9qjlf"; }; packageRequires = []; meta = { @@ -306,10 +306,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.14"; + version = "4.15"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.14.tar"; - sha256 = "114g2afnq86c6662ychd0v64aam7nhk3hacbwx1cavhg1k2l7kci"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.15.tar"; + sha256 = "1dj525adlc6qmv4msbhhlhli5603l0sgi40qfi6cs01ggqkpw64j"; }; packageRequires = []; meta = { @@ -353,10 +353,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.16.0"; + version = "5.16.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.0.tar"; - sha256 = "1m0g7sqjs6phkkf3mx2dyxr62a48rqq69lp6r5bfa6kcbr2n4g2m"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.1.tar"; + sha256 = "16zazwq3r6n7v7696cykf7p1pl977chwc5xijirm1p2lxbqdgy7n"; }; packageRequires = [ emacs ]; meta = { @@ -406,10 +406,10 @@ elpaBuild { pname = "corfu-terminal"; ename = "corfu-terminal"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.5.tar"; - sha256 = "1m53d4vi7cl91d8k550735r3ns4lm9vz3gvb0b7skib8jw3x5xqr"; + url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.6.tar"; + sha256 = "1ndg7ac61gi3ikzygaac8368jw0fwa0xs7kbnz1xp083095y5r0p"; }; packageRequires = [ corfu emacs popon ]; meta = { @@ -530,10 +530,10 @@ elpaBuild { pname = "devil"; ename = "devil"; - version = "0.4.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/devil-0.4.0.tar"; - sha256 = "1j6qmp1dh3f2g3nxmr5lwbabrfid5kwnbcx5ddsynqkpiq5c866x"; + url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar"; + sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5"; }; packageRequires = [ emacs ]; meta = { @@ -665,10 +665,10 @@ elpaBuild { pname = "elixir-mode"; ename = "elixir-mode"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar"; - sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m"; + url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar"; + sha256 = "0j4rkwmzb3grs7c56m1f6h3mcxvf4cskxf2qw9jw4fc88j5135ym"; }; packageRequires = [ emacs ]; meta = { @@ -843,10 +843,10 @@ elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.0.tar"; - sha256 = "036zf7l8pkhbyk7gz91r00v4fqi2wfdnqv95xkh7jpm2i9xcgg5p"; + url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.2.tar"; + sha256 = "02sim8hkclkp7lzj3hybjky75lyvf452wc7hmbkx1rjb3cx9j5m5"; }; packageRequires = [ emacs ]; meta = { @@ -858,10 +858,10 @@ elpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.0.tar"; - sha256 = "0709qlxhvmapdnl8bhqvg39cm6x4659mg0jzz5b9hmis5bpj1kiq"; + url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar"; + sha256 = "0ixyn669fk7gcnl3nhjma67zvnavikn75yzsa4sx850s5i4i1b2a"; }; packageRequires = [ emacs ]; meta = { @@ -1029,10 +1029,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.28.2"; + version = "0.29"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.28.2.tar"; - sha256 = "1d2g673zn59ggcr2sx9dsxibaqh6b456v4wbpg3wb5ph63rzrh8m"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.29.tar"; + sha256 = "0dzqqxb83krvc6w6rwyh2i012js2qg261cgppn2dwck8cw843jx8"; }; packageRequires = [ emacs project ]; meta = { @@ -1044,10 +1044,10 @@ elpaBuild { pname = "geiser-chez"; ename = "geiser-chez"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.17.tar"; - sha256 = "139x7b3q5n04ig0m263jljm4bsjiiyvi3f84pcq3bgnj3dk5dlxh"; + url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar"; + sha256 = "01pkcf0lpzmazah3ddd16yf2la4zd5x4mmi5lwpbsyvyfqhxhsca"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1184,10 +1184,10 @@ elpaBuild { pname = "geiser-stklos"; ename = "geiser-stklos"; - version = "1.4"; + version = "1.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.4.tar"; - sha256 = "18z34x4xmn58080r2ar6wd07kap7f367my2q5ph6cdf0gs6nz4sv"; + url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar"; + sha256 = "1bz7ggq5pl08pr68nmn82sdpb2vqi7zvsjnai8zvr93dai7p3isa"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1430,10 +1430,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.0.tar"; - sha256 = "00lln7g27iipa9lhd9hw3gl6s92d2di4nlfyjz0hgg32v39fnvjd"; + url = "https://elpa.nongnu.org/nongnu/helm-3.9.1.tar"; + sha256 = "0gfhqag2f2ci3l9v504s1dv8shz5ncmiw2658q1d16w63fgakafk"; }; packageRequires = [ helm-core popup ]; meta = { @@ -1445,10 +1445,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.0"; + version = "3.9.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.0.tar"; - sha256 = "1fvrxj64qc4976s6af2zc428dnx2p0skxdnkjikz8rpw8kmffcb9"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.3.tar"; + sha256 = "07svs1hdj30vrncp0kbmkxlfmwmdvd7nb19851p1bk0a7llkbfpm"; }; packageRequires = [ async emacs ]; meta = { @@ -1697,10 +1697,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.3.0.tar"; - sha256 = "0yv9rcpfwjms8p7wmk2lhgbn8b44nyz6g81czcr5z39w5914rh4x"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.3.2.tar"; + sha256 = "0z8q1xxx02di0788kgc4xpvl43iyknkj57l9cwf6qq6hi032c9kj"; }; packageRequires = [ compat emacs ]; meta = { @@ -1869,10 +1869,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/meow-1.4.2.tar"; - sha256 = "1iwysqxmaw85k7g742nx8z9vr3nnmwaidwjmx5n96cyssf64hgkv"; + url = "https://elpa.nongnu.org/nongnu/meow-1.4.3.tar"; + sha256 = "0anpmgpr969lkyzmsms9pcbdhjpfpwyf865pmgl0zd23m922d8s6"; }; packageRequires = [ emacs ]; meta = { @@ -2026,6 +2026,21 @@ license = lib.licenses.free; }; }) {}; + opam-switch-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "opam-switch-mode"; + ename = "opam-switch-mode"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar"; + sha256 = "19mg0k6ish0grhh4d9d9m634jkgbx80bgfwf4xh0q42piypyrmrj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html"; + license = lib.licenses.free; + }; + }) {}; org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "org-auto-tangle"; @@ -2287,10 +2302,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.24.3"; + version = "1.25.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.3.tar"; - sha256 = "0k44vkkm2njmvw3vfbc2c9v2hm8qy3bnarp328aim9761x61n9gy"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.0.tar"; + sha256 = "05n53risvyzgyqr0r7v7bgd267dh30wq266mmfhj2q37v1gkfjiv"; }; packageRequires = [ emacs ]; meta = { @@ -2302,10 +2317,10 @@ elpaBuild { pname = "popon"; ename = "popon"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popon-0.12.tar"; - sha256 = "06vsri7dka3qbiwfkl4ml8b99alah24zq8y4n1szh587xy3c7dj0"; + url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar"; + sha256 = "1ifwkiq8viic4ymph0xrpyrmr946brp2cx48yqf4jrhknafqv5qf"; }; packageRequires = [ emacs ]; meta = { @@ -2380,10 +2395,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20230508.134227"; + version = "1.0.20230628.162612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230508.134227.tar"; - sha256 = "15h9idjiggl6v1jrmkyg7p80mgpq3mwlj0x0mz3zch6xnx30d73h"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230628.162612.tar"; + sha256 = "1if790s2dr9n1jql0mjnb4jbimff3as8112c6p47w7pbcjfjasch"; }; packageRequires = [ emacs ]; meta = { @@ -2744,10 +2759,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.2.tar"; - sha256 = "1xlh4kqa8516rvmzy67pzs0ghk9rc919nq5b2sywd5mvzi5spxnh"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.3.tar"; + sha256 = "0np4wp7pmpayz8r9p3cl7z1i7yfq8xmkn862n9d104szf4ffk0if"; }; packageRequires = [ emacs ]; meta = { @@ -2759,10 +2774,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.19.0"; + version = "0.22.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.19.0.tar"; - sha256 = "13jq4kprxnv2wiz1hzzjcfg418d0gj2z0bm27y1myh4ak5x1jbvj"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.22.0.tar"; + sha256 = "0iqihdlypq9hs2m351pzrzc43jdxzpbws5pmb035668r38qc6v32"; }; packageRequires = [ emacs ]; meta = { @@ -2774,10 +2789,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.6.0"; + version = "9.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.6.0.tar"; - sha256 = "0zasgv311mjc1iih9wv8vb8h53y2pjx24xsbdnn0wk8xcdk4z8j6"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-9.0.0.tar"; + sha256 = "1s69mm7yhz1dhxz118ik7nxqw6gliivbwv1qvylk8nz2lhr8sf9n"; }; packageRequires = [ emacs seq ]; meta = { @@ -3213,10 +3228,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "23.11.20230609124049"; + version = "24.4.20230805215231"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-23.11.20230609124049.tar"; - sha256 = "0vp457cvwvwbdzglm7s3dbghhc4p3lpr7rxni75fiyqrv8smjrwa"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.4.20230805215231.tar"; + sha256 = "19r7avllf97g3s8zsv11nb4vs4j005ailm1lav48nll9zlm58j5x"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index bb15e56ed9423..e7800bd4a0d6f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -308,8 +308,8 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20230603, - 1054 + 20230705, + 1437 ], "deps": [ "erlang", @@ -317,8 +317,8 @@ "maude-mode", "yasnippet" ], - "commit": "cf3b8e1887adb2a9c0abd90d8b42af466d478608", - "sha256": "17ij1zwnn6cdar9c2kq0vl94hzl14lrq53kd05628bsbsbi9a3zj" + "commit": "bf21971bf57100e9e1ac26563207b35b377ec057", + "sha256": "070xa0hylkxy2j8g5jhdv3q003aqvasp7ald6f98skg6a0hsrvc7" }, "stable": { "version": [ @@ -1677,16 +1677,16 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20220111, - 1121 + 20230731, + 802 ], "deps": [ "cl-lib", "json", "request" ], - "commit": "789ec3425623e43a29755e8daaa02305df8da8ed", - "sha256": "0kn5ljz6w7xz8dy4hiwb0ssw13hzg84mmn24i2i61snp4c1551is" + "commit": "63eb19a10e4262c529f1b205ef61d69055350f49", + "sha256": "10p9mpnbq1xrwhxy54idiz4vjy2kflm0ymqpidnh0sr5dcnap867" }, "stable": { "version": [ @@ -1842,11 +1842,11 @@ "repo": "bbatsov/adoc-mode", "unstable": { "version": [ - 20230413, - 800 + 20230803, + 2350 ], - "commit": "a7691c8b9a738fd724007a2a283ed2c20684a7e5", - "sha256": "0zhdxhpak23pq2r0dcf27a22kclhl4pn4abm5c6y8pi78g5ncjh3" + "commit": "26d189ef5486453503d7f0296258aa5883d27a29", + "sha256": "1f06lznxsijp3iiia1cj5w2y47d8ykn61jbziddhz0jfgdn1m4ag" }, "stable": { "version": [ @@ -2272,11 +2272,11 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20230326, - 718 + 20230711, + 2139 ], - "commit": "bcd9158f18ead2aa25f10a48e4a38e2c3ed64217", - "sha256": "1i2nyidg7sla80x88cmsq99cjyd77ky1dgmci9wxhvz391ngbwav" + "commit": "93affc8a66e0b62e55635ac4a7373a1b6659825e", + "sha256": "00xl3ny0dn7mw21shsx83fhmr667zrxvnhp3w0rg22vdj39lq5wp" }, "stable": { "version": [ @@ -2528,11 +2528,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20230505, - 1635 + 20230615, + 2016 ], - "commit": "f75c1130b72c718bfaf18b56c445c4b58efc714f", - "sha256": "0lv3yizp2a0lqm3gf576agdpcr3hpv1qc9vy8hh09pdgpkjznslj" + "commit": "f491f39c21336d354e85bdb4cca281e0a0c2f880", + "sha256": "0qv2lgcf8g4qrsxzyxmif5szf0n26gvda4d2llbl2gnnzirl1yp0" }, "stable": { "version": [ @@ -2552,14 +2552,25 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20230224, - 1610 + 20230617, + 1206 + ], + "deps": [ + "all-the-icons" + ], + "commit": "8eb3e410d63f5d0657b41829e7898793e81f31c0", + "sha256": "1iyn7dyxil07gsa19hngpbapzmbhcwrplvf2cg1gkywafcdhjw6w" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "all-the-icons" ], - "commit": "b08f053cee444546ab44a05fd541f59e8bc8983b", - "sha256": "1mfdhiv70ay7mlcvm6aibjx8fa9vdy75al4rmdkcms9wf9qv0g3l" + "commit": "8eb3e410d63f5d0657b41829e7898793e81f31c0", + "sha256": "1iyn7dyxil07gsa19hngpbapzmbhcwrplvf2cg1gkywafcdhjw6w" } }, { @@ -3273,11 +3284,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20230401, - 1613 + 20230709, + 1507 ], - "commit": "69d7e2138c35f8c8adb33cf27b440eee2591810d", - "sha256": "1kj638xl8dc2qnvlhgy9yb6y08xn53aabwchmbs0dmxg72k7mla3" + "commit": "dd2760d1725f48ffc5542ad88466a3807c95df05", + "sha256": "09as35kaxlg5vcq91h0jc3qslpcyimi3vfwhh07sbahhj1j9rfl2" }, "stable": { "version": [ @@ -3322,10 +3333,11 @@ "version": [ 2, 6, - 3 + 3, + 20230805 ], - "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", - "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" + "commit": "d4e6bf47156784efc1e74d0f0f2eeadc90a5611b", + "sha256": "0mxqliq5lyf8c1p77p54xrgb2fnnkk6n9miv59snxvhcz6s1yh77" } }, { @@ -4114,15 +4126,15 @@ "repo": "slotThe/arxiv-citation", "unstable": { "version": [ - 20220816, - 542 + 20230713, + 627 ], "deps": [ "dash", "s" ], - "commit": "e41d5b90a00b79849cd2fd405b2af75a53b15abe", - "sha256": "1j5cgkiksmgl6slacs5q7wrzyd8bqh3q1yn0rivvfn2v2fxzd5fk" + "commit": "04de0dae1121fb92c30b393449c6f8d6d940dbed", + "sha256": "0pvlmp4jmgjsym274v22dz1z9rqwj0mnxjkk3snxdz8z88gqrxkc" } }, { @@ -4278,6 +4290,30 @@ } }, { + "ename": "astro-ts-mode", + "commit": "62d86658814385cef1905f7e2b1919c4ddce86b9", + "sha256": "1jsg49wq5h686c7ncvslsm4fnvidqjf6gqjv3d7m1pn7f3rwd63p", + "fetcher": "github", + "repo": "Sorixelle/astro-ts-mode", + "unstable": { + "version": [ + 20230802, + 437 + ], + "commit": "207e5da093aa8141b9dd2f5e98afd8952832b4b0", + "sha256": "0yfz5xdpwzbpihbnm5kixmjpqcmj86h6lm71ji8vzq044rassfga" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "688b7c9f661571fcd7d6d754a91e48a9938d8684", + "sha256": "00smy30cxx0n0v2r2pl4jh10vw3w0klhbgk14cbw3yq73gp29pmi" + } + }, + { "ename": "astyle", "commit": "b495f29653edd15cef8eb3c9ea4d8aea35b0ac75", "sha256": "0vchbm2lb9qa66fspyylyv0snmrxjfpzc332j0k7pkp6cmi08fnh", @@ -4558,16 +4594,16 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20230310, - 1555 + 20230707, + 1457 ], "deps": [ "dash", "f", "s" ], - "commit": "2df105d0bd23a468e75fad0fed7d39013328526d", - "sha256": "1zm7xjqlcgrvzshzniyns0qk9v6b1avc9fhly63yr3ki1rvqadpq" + "commit": "1019b86f5398dadef61efc76fefe8fa8be1193a8", + "sha256": "0g1zfmv9v8nfkz3y3hfspvrwh64mk6v73dsclmvpaq4lhjcdva0j" }, "stable": { "version": [ @@ -4912,20 +4948,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20230511, - 2120 + 20230714, + 16 ], - "commit": "36646df118dbea91e3d00d06ed712c5d05399404", - "sha256": "1zkqpvnashwn721qwf9khwizfxq9g3dhhy1siyk1s2wq1a9li9wq" + "commit": "6ed8e29d23c6c91f8c98f18ff745d2475d6f6a38", + "sha256": "0rqyf4jz6j820jw5ky1b1phrgms48ifphk5lv02av4jsg0cvsz1q" }, "stable": { "version": [ 1, 8, - 0 + 1 ], - "commit": "36646df118dbea91e3d00d06ed712c5d05399404", - "sha256": "1zkqpvnashwn721qwf9khwizfxq9g3dhhy1siyk1s2wq1a9li9wq" + "commit": "3a255903643227c0db10ca2371c33ba9e8ec9924", + "sha256": "0p2znbid7a32shgh1zidrr53hv79dhw1jcjaad2aglqfqjz7a3qn" } }, { @@ -5227,11 +5263,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20230307, - 17 + 20230702, + 319 ], - "commit": "dcb5b4e6da8553c43b8ad7aff51de477980e23d8", - "sha256": "1jw01nrl74wwvjvzgk857as7vb5cfbljyidbyy5rdffmkalnsj0g" + "commit": "af19a779c6df1e371d26e4092e6a2113ad1f44cd", + "sha256": "0h1d0i8p4v89l4xq76q89fnfifq2bk1xf92df2j91zwn7clj7z3c" } }, { @@ -5623,15 +5659,25 @@ "repo": "erjoalgo/autobuild", "unstable": { "version": [ - 20230518, - 438 + 20230729, + 2356 + ], + "deps": [ + "selcand" + ], + "commit": "0f4cf8eec86806c59743fce2c5ed7e63db060cd2", + "sha256": "1vpl2hs1igzm6cf7z5ysxm5s5p9g8zy3d4iwimqrzd9hxk1hyk3p" + }, + "stable": { + "version": [ + 2, + 0 ], "deps": [ - "cl-lib", "selcand" ], - "commit": "1cd2d923303392cb1bb93fa0398332c2fce8399c", - "sha256": "0zmfydwlc3jiifsgwsg12yj9ixvl5h7fpcgxm7k1q412y3z4swiw" + "commit": "151edbe52e7bea02155e7381450956c571648077", + "sha256": "0l4vxbhjhlm49q65fr61nnckdrn6hvk6xy1cg8lh4jnhjnhfyw0f" } }, { @@ -5681,6 +5727,21 @@ } }, { + "ename": "autoscratch", + "commit": "3a7d9122d09bb952c1ae34cf0104cb82a0f6e2b5", + "sha256": "01h33w3w9isjwz1mcr87zflhgnc14f8655la0h9bf3033jnbi5g8", + "fetcher": "github", + "repo": "TLINDEN/autoscratch", + "unstable": { + "version": [ + 20230612, + 719 + ], + "commit": "c5cf26b41f86aeb9f8bc64da2fe484ece807ac19", + "sha256": "0sypalcyz6lmcqmddcl0wjxvry1mpdpzni7z7z2m3fnwcgx201hx" + } + }, + { "ename": "autotetris-mode", "commit": "4c5c698b7dfb179f43b9fdf4652b96e2d7f8e7c6", "sha256": "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb", @@ -6070,6 +6131,36 @@ } }, { + "ename": "babashka", + "commit": "07aee214c4db85ca2b0ad8b8c55cf99345b84a7a", + "sha256": "152z5xd8sw4c4w3ar9fkyxc4svkihf70bhbijg898x1hdpnmi58r", + "fetcher": "github", + "repo": "licht1stein/babashka.el", + "unstable": { + "version": [ + 20230704, + 1224 + ], + "deps": [ + "parseedn" + ], + "commit": "0714564d2092d37751085ac729712f05c2bb1b91", + "sha256": "1gwc7acm46ii1jx86d6rnihi3ga4601nyq411zgp8rm4xj9c1xrl" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "deps": [ + "parseedn" + ], + "commit": "0cf130ce8427e17389d5741ef7952c4c8334d928", + "sha256": "08ryg66kmj3l9yc3527sjyln5irs49x9ccsf1y64h2adgkbn58qr" + } + }, + { "ename": "babel", "commit": "b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc", "sha256": "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c", @@ -6402,19 +6493,19 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20230502, - 2156 + 20230716, + 215 ], - "commit": "111de0722f13e15f406806e43ae1dbc97251912c", - "sha256": "1lw11qhgzgrixcqxj078pr7a5fn3z42wybzafw7y9g6pkmk8bfsy" + "commit": "f7d41a7605dff1db3ff930cb0aa15e7de76f0523", + "sha256": "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "26b84fc93505219517a512eb01e6370365174989", - "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba" + "commit": "f7d41a7605dff1db3ff930cb0aa15e7de76f0523", + "sha256": "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0" } }, { @@ -6425,11 +6516,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20230607, - 931 + 20230612, + 1103 ], - "commit": "6fca128da5e53d9d953052a6775525daa325367d", - "sha256": "0q8j06pj8z5qla5i3069fapwxi5j85p73630ah8v103hfafdf2br" + "commit": "f1daac0386c24cbe8a244a62c7588cc6847b07ae", + "sha256": "0s8p5xj2v3zgqj9z1iqpnca6wd78jhzvgfkpsd4bqwbrhi543sjm" }, "stable": { "version": [ @@ -6677,15 +6768,10 @@ "stable": { "version": [ 3, - 2, - 2, 2 ], - "deps": [ - "cl-lib" - ], - "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", - "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" + "commit": "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae", + "sha256": "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7" } }, { @@ -7407,8 +7493,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20221024, - 857 + 20230717, + 959 ], "deps": [ "biblio", @@ -7418,8 +7504,8 @@ "parsebib", "s" ], - "commit": "78f5931e1cc82e7ae2bcf0508cf31d0d1629a8dd", - "sha256": "1qbrkq0yidrp2x2qjpxlyx14yjcv2lir0hjabylapmkmr048v3fk" + "commit": "ef07adfeda1e25d891875cb9a11983d5e26fc36d", + "sha256": "0iy3ikz0hfyghm5q2lgh71p2s3626d1nlc1fmgjp73w0nbxyrc77" }, "stable": { "version": [ @@ -7648,14 +7734,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20221224, - 1132 + 20230729, + 350 ], "deps": [ "seq" ], - "commit": "828f2fd079769e5a2c50f8998e84d63a9a95e797", - "sha256": "1pa63y6ldm8gbzpx365i3hd147qglkyi10vlj52rcd3p8qvrg9gq" + "commit": "859d89c00e21c83565ed2b45f8d7527b45b1292c", + "sha256": "0da3wx93rbsy9y1hd5w722sgblg5bffznw00vyylwnq5zaikh5lp" }, "stable": { "version": [ @@ -7702,20 +7788,20 @@ "repo": "liuyinz/binky-mode", "unstable": { "version": [ - 20230120, - 1708 + 20230729, + 1330 ], - "commit": "04f1132ea1945861da0081cb2ad08076d20cea57", - "sha256": "010yyhgn049nfmx3rbc3h4a0ypi6vgkn340rqfvsmml48ax75chn" + "commit": "150f65c408f791f8a8526f6c4666dcbbbea3e219", + "sha256": "0dp3zj0dk46df3qc7dy05k822w2dnj147chvz387ldk94rqnmsb0" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 1 ], - "commit": "e35a477e28e5ace70bbdb2a5d0c503639528fb5c", - "sha256": "1kvqrkm21g06q068jvf3a95299n0xd550lba1wlf0h6pc1jrg1fn" + "commit": "466699c923e9b7035ed8d5b45e2abec96838ae8f", + "sha256": "0l8zppilkwin4ww73d66nw6a2hchj05cnv2q0vczw49b7zqikyh9" } }, { @@ -7916,11 +8002,11 @@ "repo": "gdonald/blackjack-el", "unstable": { "version": [ - 20230528, - 1152 + 20230715, + 1645 ], - "commit": "b58e0fab096314177a21275f64143199b628d429", - "sha256": "1ijsis77wnylr09j7jq8avkk82hp299m38fxrw5kh7wzna5mpmpq" + "commit": "af909a17285c3e570b6f8703518ff1f18c8bf421", + "sha256": "12lqhnidfbm0jldpi6v923l1mp4q2w2pykjiqjj2v8jvn4nv88yw" }, "stable": { "version": [ @@ -8473,16 +8559,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20230410, - 1115 + 20230720, + 1235 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "9b4260fbab2d3cc6f58a5c1360a235a03de4f0e1", - "sha256": "11k9ij15v58pf0as3qn2lg1hyblawj0gapvmp1vnk5w37x8958k5" + "commit": "75b30ef8703efb9ffba12e92685ad82e3ab55962", + "sha256": "1866m1zy3hm8rcmc74zxmd6xcb4jwwl9znklgs3xxdb87si86hls" }, "stable": { "version": [ @@ -8506,15 +8592,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20230319, - 1956 + 20230717, + 1325 ], "deps": [ "epkg", "magit" ], - "commit": "723ffe760d535618794d9e90ff17c18f66120131", - "sha256": "0v56z5v21f3n1vvq1vr1cfy5dphhi9w16wlqd1w2d773p87nffb0" + "commit": "e29d9839390c0f9e6c375acb4374430cf5595fdf", + "sha256": "1k0r9jw2qyflsxy9kiw1s4izj78q7awpd24p59dngy52c9w5kjmk" }, "stable": { "version": [ @@ -8532,9 +8618,9 @@ }, { "ename": "borland-blue-theme", - "commit": "f2ff5916fd2caee778479bc2ad3ef13ee514052c", - "sha256": "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx", - "fetcher": "github", + "commit": "71e05553c92d5a92d0e57a7637c86ee16f498241", + "sha256": "06fn88wyla5qrajkscbb43yx66sj9wkf0m04c5sjk08cmgf11dyh", + "fetcher": "codeberg", "repo": "fourier/borland-blue-theme", "unstable": { "version": [ @@ -8666,22 +8752,11 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20230423, - 1816 - ], - "commit": "b459f30498bf33efb73d095e1ff0ae98423c0e47", - "sha256": "19fmmhqinab7ibrax50mik8rxr5ynpjqx11clhljzlvdyj16y772" - }, - "stable": { - "version": [ - 2023, - -4, - 4, - -4, - 21 + 20230718, + 141 ], - "commit": "5ce39f697a4ea8c3c2b00003c477f3d2fa2739ea", - "sha256": "0hqs096x28jiax99ns5d9gkplqmhv0zi2829fmix36bjgl9005h8" + "commit": "cd7a9956a03bafbc4beff96246cad94779b953d1", + "sha256": "0glf8vmgchc3sqlk2v2aiyyhap3ym7nh1hdaz9hjvznjbwai12b0" } }, { @@ -8764,14 +8839,14 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20230428, - 1402 + 20230803, + 2022 ], "deps": [ "fringe-helper" ], - "commit": "ca6f9869707dab5929e1da9e13bdf602207bc7f9", - "sha256": "15qq87fhdb99qd9ndxpprk43ip1mk57k1f7gin2yv8wdvv36n6bz" + "commit": "8875f5fcd173e220bbfa6bf9f8f09d721a29cd50", + "sha256": "0iqakgg7yz409776p14adg4vdn9ik0mf95vhzx23g3pd79lv34wb" }, "stable": { "version": [ @@ -8935,25 +9010,25 @@ "repo": "plandes/bshell", "unstable": { "version": [ - 20201219, - 139 + 20230805, + 1646 ], "deps": [ "buffer-manage" ], - "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", - "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" + "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e", + "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7" }, "stable": { "version": [ - 0, - 10 + 1, + 0 ], "deps": [ "buffer-manage" ], - "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", - "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" + "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e", + "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7" } }, { @@ -9162,6 +9237,21 @@ } }, { + "ename": "buffer-name-relative", + "commit": "2edc64007ec2b606595aa0d0b63cb37482a6c146", + "sha256": "17ll5spa34pzxf8a62fqmpa6q23zi0zq52znfcsy54ndkm3s04ab", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-buffer-name-relative", + "unstable": { + "version": [ + 20230625, + 347 + ], + "commit": "6c1e98f761344b2d2d51f38d587161f71ca0e750", + "sha256": "0cvmg84k54kpd4qkijnjcqcw5qnnb2ghwviv72z0jgird0c9h9b2" + } + }, + { "ename": "buffer-ring", "commit": "f6a145814144e6386efa9f96b43cf81d59a1091f", "sha256": "0ch8pgiq1d90d06zxa5xvkvy18nwxlp7mfaymd6ldq20vgks07x9", @@ -9304,6 +9394,21 @@ } }, { + "ename": "bufferbin", + "commit": "a992a3ebfaf10592fdce129c059406b1854c44bd", + "sha256": "06mg03r88zc2fpdyswr6lyavsjfx4l1d0si3586cfpfy0lychrrd", + "fetcher": "github", + "repo": "blueridge-data/bufferbin", + "unstable": { + "version": [ + 20230706, + 110 + ], + "commit": "ee4bf49cc69573f690e2e9f36f03c20b322c1730", + "sha256": "0qqajbr3pfpxjjw7bimyqxj7gvmd09313ai581ld4ik9n48izhv1" + } + }, + { "ename": "bufler", "commit": "4ba5657f237eea9073a46a4127be5795be07c687", "sha256": "1zxvkrgwk7v3404vcwyv5nag60ri72qqi5fkpwwmzc9cs2bckj20", @@ -9766,14 +9871,26 @@ "repo": "erjoalgo/emacs-buttons", "unstable": { "version": [ - 20201123, - 2333 + 20230628, + 2340 + ], + "deps": [ + "cl-lib" + ], + "commit": "ae97996cc52bf0523f5b6626db14987c3b56b3e2", + "sha256": "08zn2y3rcrjhbha9kr3acv90waqmnhvq0qbl0fl5lyykj71dq17m" + }, + "stable": { + "version": [ + 0, + 0, + 3 ], "deps": [ "cl-lib" ], - "commit": "de41b48244574a13000c4289fdb4216a2b0490ff", - "sha256": "1kxcxzzhvrkw8sk699gadf83sw9vv1sms6jf8w08vzblbd5na567" + "commit": "ae97996cc52bf0523f5b6626db14987c3b56b3e2", + "sha256": "08zn2y3rcrjhbha9kr3acv90waqmnhvq0qbl0fl5lyykj71dq17m" } }, { @@ -10386,25 +10503,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20230606, - 904 + 20230713, + 1735 ], "deps": [ "compat" ], - "commit": "6c9abaf15adfbd9c6bf593609ac3bea8c8de0611", - "sha256": "1kriyxy7bqgq0dh3ci0s4chl177drzpn3pnd5xa6ipdbya47amxn" + "commit": "5b28cd43f2efa19dbf5053f164cce622a4b5bdae", + "sha256": "1kpyvl0c2v49b1d0lnvqi9pa20ry9889dncrqmg7h6ns5m0886rj" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "compat" ], - "commit": "db3059af52718c7f55485ef183bdad3e40f58df9", - "sha256": "1aivq3v00l17lmq7fmdzhc6lczi9ky2wl0ayab13vkdcidl5j1kd" + "commit": "c8e3a75f2b1096fbb09c9f4b3f60ab1fdcfee13b", + "sha256": "1dvqfi41bkw1bi930kjww1yjrdmpk86ji9p7spa8dd0lrc3fh2c7" } }, { @@ -10423,12 +10540,12 @@ }, "stable": { "version": [ + 1, 0, - 10, - 4 + 0 ], - "commit": "a91ec65323c2577732224d0cf6f5bf1e79d3a724", - "sha256": "0zz1w35fbldwd9b6sgr9759jh4v8cyfia6vvicyqqq5jbjfk36z3" + "commit": "928c8390d4d562bd32dc79a42eb64e9bdba572d8", + "sha256": "0fkkzxhn05sa0h0sdkm77gza07jagg6r3vq4w1jaiklfswjwbd1l" } }, { @@ -10763,21 +10880,20 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20230603, - 534 + 20230711, + 1235 ], - "commit": "eacb31bfc219fc48e033f58c6fece4b5241a2c51", - "sha256": "0kwi094jarbvvahqmr9syvl8iag6k291jd2knnn0ph4jpr82rmdm" + "commit": "73f3e90de767a72444db424d3a10ba18b57ac1be", + "sha256": "0iawvp4pwxbnqyd6wpdawx9y5awz0pn16mz8a19kblvay412fyga" }, "stable": { "version": [ 0, - 2, - 0, - -3 + 1, + 0 ], - "commit": "785c9f57a43c4c90041290556d999db3d9da5be9", - "sha256": "1dzfashhjig06m9zs4w2ns64h3hzck93p4ddfwnr9zaxz0gmkp4s" + "commit": "f36765cbbd4129aabb22250a87e90a1387bd5dc7", + "sha256": "1xbhq8lfgdx01rg6ddnfhjh8dxhcsln842hl5hm0i56djd4kdghv" } }, { @@ -10926,11 +11042,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20230411, - 748 + 20230709, + 1511 ], - "commit": "692142603c6229e5aa5c8285eb797e401cef9ac3", - "sha256": "1avdm5pgsbhp796mq0nxm175r26gxxfrpmqhrzbnnd10zjbgrrpz" + "commit": "a0153ef8898b0604be5e690de02a37cad56d3f17", + "sha256": "1hs0f0sql36afpp3mfkzcxb1m8b7mswdjsfpl9m7gypmywj5a2jv" }, "stable": { "version": [ @@ -11158,11 +11274,11 @@ "repo": "nbarrientos/cern-ldap.el", "unstable": { "version": [ - 20230418, - 1249 + 20230626, + 1158 ], - "commit": "7a2dfa4c5ec9d05ec0c4e90caedae8508a96196c", - "sha256": "1n6v8mii8j625fp4kp7iwvlgvlnw0f9mvicrqfh3smg5008mq49a" + "commit": "70b5275f0e7b8e15a3def48281f364a32c55afce", + "sha256": "0f8yl9az24bhw3w5maq68qn9gz4y4vpvf3xsngsai358vs69ibr1" }, "stable": { "version": [ @@ -11234,22 +11350,13 @@ ], "commit": "92a25872a6d1de00c5bfc2b9455ccb0082bf6569", "sha256": "19nv6czxbl6kpcx54bq57xr2df2dyjwjg11vwal19hy6w7yd1av1" - }, - "stable": { - "version": [ - 3, - 20, - 0 - ], - "commit": "502608a7b9feb9102878734d048db95118891a55", - "sha256": "0b8isy1p8c5m0j4km18jh3xijcxm4jnm2vwx9mp75mky95742w8h" } }, { "ename": "cff", - "commit": "c4e056132be11481aa26e89d5af1cd03925f92d1", - "sha256": "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc", - "fetcher": "github", + "commit": "71e05553c92d5a92d0e57a7637c86ee16f498241", + "sha256": "148yizsw2393d69ygx4zf0vdqr8rzjq3ysqw5qnqj4cr23bs72x3", + "fetcher": "codeberg", "repo": "fourier/cff", "unstable": { "version": [ @@ -11385,20 +11492,20 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20230601, - 1159 + 20230804, + 1037 ], - "commit": "4c92ab6454b03b1bd3829bf79e22cb862fed11b5", - "sha256": "00qm53bas531s9z5f97q3va0lc7d8glzs4jp5cbqy4prjs45iwan" + "commit": "c22f5572c0946b0d21f4d489308ea0ce9f305ea0", + "sha256": "0lz98f5lic1wlbwdj8j85kgsjrsbbmy61q9cqn2bjki272bcfzjf" }, "stable": { "version": [ 1, 4, - 5 + 6 ], - "commit": "4c92ab6454b03b1bd3829bf79e22cb862fed11b5", - "sha256": "00qm53bas531s9z5f97q3va0lc7d8glzs4jp5cbqy4prjs45iwan" + "commit": "c22f5572c0946b0d21f4d489308ea0ce9f305ea0", + "sha256": "0lz98f5lic1wlbwdj8j85kgsjrsbbmy61q9cqn2bjki272bcfzjf" } }, { @@ -11556,14 +11663,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230609, - 704 + 20230806, + 1418 ], "deps": [ "shell-maker" ], - "commit": "c91e111f94117dd574b5c3d0945c9c0d87c0d839", - "sha256": "1lcdi37hx3j2149c5nzcy34bg6afq0vgxkg88vk05vq2ljj9k33z" + "commit": "c5f470a182027b6afde3e39558837e22c7fe282a", + "sha256": "0249xpryafjsp9ghacshkqiw0nf56adl60aqhnpcy5wza5mkm516" } }, { @@ -11780,11 +11887,11 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20230106, - 1716 + 20230726, + 1638 ], - "commit": "0578f81ab01f5280e6c68d7a8a70ae4b4ba29755", - "sha256": "09qjp6030xfj27aswpi224czjq28ac32267k1y4gfp16gg4iimdd" + "commit": "1389782f8c0780c7e66f8e77b10345ba1f4eabae", + "sha256": "0canvjxnlzy2ia1czvabicsnjj9lqdw1fldr7b1sv4avzwrvqlyr" }, "stable": { "version": [ @@ -11919,25 +12026,54 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20201217, - 1751 + 20230805, + 1641 ], "deps": [ "dash" ], - "commit": "b8b1b6c5568f8778783454d5747912487c8e69b8", - "sha256": "022xpsngfn0pjsgmpb24pg428xzkpk97yhfqjc7ppncizr61n5cv" + "commit": "90df8d118c20d5d05ee97daf81012dc39759be92", + "sha256": "0vjff8vym4c9j6ddpivgsg23463k6k7ay8wa2harmib2bbrzqk75" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "dash" ], - "commit": "27d7219b775f3061536fdca6eb52142d6a21781c", - "sha256": "0az845mxnkzwsz5l2gkr8cwfvgmqbf4fxjxds46zax6701m3hy9b" + "commit": "90df8d118c20d5d05ee97daf81012dc39759be92", + "sha256": "0vjff8vym4c9j6ddpivgsg23463k6k7ay8wa2harmib2bbrzqk75" + } + }, + { + "ename": "chordpro-mode", + "commit": "aa1506278669c384755b9879fa2bcb110a370acf", + "sha256": "0vqcdsixq6vnk932bnk8qyk77az7yvcg69p6x5vm0wfk1brx1a3n", + "fetcher": "sourcehut", + "repo": "breatheoutbreathein/chordpro-mode.el", + "unstable": { + "version": [ + 20230725, + 1841 + ], + "deps": [ + "compat" + ], + "commit": "e0e0840fdce7bc689a3233545d43cc4776822563", + "sha256": "1v82yablsi7ywri40gkyvx3ly3kz5jxxalgj3cqr2b9vphngn0w6" + }, + "stable": { + "version": [ + 2, + 0 + ], + "deps": [ + "compat" + ], + "commit": "0f1e0504636143a02c356bb57ef56c53de152c15", + "sha256": "0b1gkvrazsk1kg4iblgwzl1pr2pc5xayhffgyhfk3zqrgqrvx9p7" } }, { @@ -11987,16 +12123,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20230302, - 700 + 20230712, + 1532 ], "deps": [ "dash", "seq", "ts" ], - "commit": "015524bbeb4a112db7bb2af813408cc3c5c93240", - "sha256": "19gp6bcsinw8f52gasbg2c46v6sny3s0m5j5h37wrdj4khif1xz0" + "commit": "dbbcdfd4398cc2845a20aca4161358fafcb60c65", + "sha256": "1dq7gnvcck1sg7d8xr93inljfdc736kdlg8y4fa3796mbwb22vl9" }, "stable": { "version": [ @@ -12040,14 +12176,14 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20220414, - 726 + 20230629, + 1039 ], "deps": [ "chronometrist" ], - "commit": "9f970ebb637d57b3234b6e1e85840dcf524037e6", - "sha256": "0nsqrcgq1c5hww15772xsx2agjg928yi3ydh9c071gzk7wkm6wkg" + "commit": "d8290a82ea65730413627325a705067269cfa2f1", + "sha256": "1yzd3zfr99wgfb29gcs3gnznl7vbw2fjvxkl7cmbix3aw0pbpq10" }, "stable": { "version": [ @@ -12070,15 +12206,15 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20220321, - 349 + 20230629, + 1039 ], "deps": [ "chronometrist", "spark" ], - "commit": "239f733dd8f784a5251ae253d350a99fb739da6e", - "sha256": "0z2zbcpl9aad12vpk1lg096sh4nqmq96rr6cq0x0gbsq69i65iv9" + "commit": "d8290a82ea65730413627325a705067269cfa2f1", + "sha256": "1yzd3zfr99wgfb29gcs3gnznl7vbw2fjvxkl7cmbix3aw0pbpq10" }, "stable": { "version": [ @@ -12096,17 +12232,17 @@ }, { "ename": "chronos", - "commit": "53648c5699fc03e50774270f9560c727e2c22873", - "sha256": "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d", + "commit": "d7a512e3af54b4c5a5e8fc03eac005010355fc68", + "sha256": "0fr46ijdn7s1x6n68vjnf58b7lz8mrjmbf63xm8l31rxy1jgj79c", "fetcher": "github", - "repo": "dxknight/chronos", + "repo": "DarkBuffalo/chronos", "unstable": { "version": [ - 20150602, - 1529 + 20230804, + 1712 ], - "commit": "b360d9dae57aa553cf2a14ffa0756a51ad71de09", - "sha256": "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4" + "commit": "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1", + "sha256": "009wc3hb2mflcpk0jdifvppjjj7m5gzgcf1s4x1knsrzqhmm9vxz" } }, { @@ -12150,8 +12286,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20230518, - 550 + 20230804, + 1656 ], "deps": [ "clojure-mode", @@ -12159,10 +12295,11 @@ "queue", "seq", "sesman", - "spinner" + "spinner", + "transient" ], - "commit": "99c90fc5d8158e116d5d6abce78da02c3aed5f5e", - "sha256": "00dn4hxia6mmf2frmwsnjj6fy0rp7pibq4j7l56h475n8d19aqh3" + "commit": "eedbab26684cb1ce01a940b5b0da9ff78aeb4eac", + "sha256": "02xm1d80z91mmg1l8pgfb4grfp7bfjk0lqsgrw35gfc49x5lf47r" }, "stable": { "version": [ @@ -12460,16 +12597,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20230325, - 136 + 20230725, + 1020 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "02034795f4c3bb46e782f8bd34dd486ce1fb9244", - "sha256": "01w4z8ydx9w2rpg3sia39anmmyqwf5ap8h9gb7x1dsw207008pb8" + "commit": "2c0547db57f2fb30ff071d126b256287a4e9452c", + "sha256": "1v5zqr2azgxsln4z413ldwj1b0hsx3rjlh3g6mw0nhv0jbfgcxjf" }, "stable": { "version": [ @@ -12494,16 +12631,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20230403, - 1038 + 20230708, + 403 ], "deps": [ "citar", "dash", "denote" ], - "commit": "327c7f386e8660c63b48568d23315cbebf95d151", - "sha256": "19ifw6vp0jwlwblps0240hzghniqqvnnha562y35mybmibwnv87i" + "commit": "2107142e3c621aa64f95c7820d4b12b69f1763f4", + "sha256": "1x82y75w5g84vjdvxl5xvlbrlph40rm9fg0cblixq12i4sdjb9ks" }, "stable": { "version": [ @@ -12671,11 +12808,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20230217, - 1202 + 20230630, + 1536 ], - "commit": "4626ada80fabea6b62935567acc1cb8dad607016", - "sha256": "1bs66lk094g1bgk09zamv184j1nl64z8hvwjvf4w28kbjpvnxvsn" + "commit": "c617acef3dc2a88aaffa42a515ce7dbaba98228a", + "sha256": "10lj6w67vsdxdzg0y69qzpccai4054xg8kl9jpavnwn5i12nlp7l" }, "stable": { "version": [ @@ -13100,8 +13237,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20230520, - 1550 + 20230801, + 1030 ], "deps": [ "cider", @@ -13114,14 +13251,14 @@ "seq", "yasnippet" ], - "commit": "cfd184e93b9ab63f003fb2cf54a396e7b932a049", - "sha256": "0a3zkz1m8vzsw1k04dzyc5m772l81dp2dg6rrpk86lpra4vidqsb" + "commit": "a0f488206290acd83315f6d22171dcb9e671b7e7", + "sha256": "0ix028ca8s9m0az4mpvfj4gcdn3xqmhbc9bbymvy4y40g7kkf71q" }, "stable": { "version": [ 3, - 6, - 0 + 9, + 1 ], "deps": [ "cider", @@ -13134,8 +13271,8 @@ "seq", "yasnippet" ], - "commit": "8300d5cab861668f313fbbbb3e2926e3e5130e86", - "sha256": "15ya7hp5d2kwh1ig55d75vlghm1vsq99jh44i8q8v25vfmzjp7gp" + "commit": "1fdc95a479406a83865d06f43122354c0dd2b93f", + "sha256": "1c7ndc81j3pljgf7n188f3mm6vm3gyiplh4mnb4y5wbkbnpiwgdc" } }, { @@ -13429,20 +13566,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20230314, - 758 + 20230626, + 715 ], - "commit": "906d6a47a646d1191eaead6f8e1ae0810aa9b626", - "sha256": "1fp0vzivxxycb4il0xwq3dkj19mw2c1zq2v8yn3lsa9s27kfmkpm" + "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", + "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" }, "stable": { "version": [ 5, 16, - 0 + 1 ], - "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", - "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" + "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", + "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" } }, { @@ -13453,26 +13590,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20221214, - 915 + 20230626, + 715 ], "deps": [ "clojure-mode" ], - "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", - "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" + "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", + "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" }, "stable": { "version": [ 5, 16, - 0 + 1 ], "deps": [ "clojure-mode" ], - "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", - "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" + "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", + "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" } }, { @@ -13545,11 +13682,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20230604, - 211 + 20230805, + 1336 ], - "commit": "019298655e0f76e5fb24150149d647bfab546eb8", - "sha256": "1jj1slchaph0x67k7jpwzyzl50c5ya4b32pzp68yjrvyz3nqnj9k" + "commit": "2d78f6be4f37196ae3a22c51ce2b39f126f003ee", + "sha256": "1cr3l34hsz45p7y08ca8kkj5kpac0paxiyvkg5mi0zpgb93p7jwi" }, "stable": { "version": [ @@ -13797,22 +13934,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20230422, - 828 + 20230725, + 1758 ], - "commit": "a2fc16510ce3f89e34bd802c808d10951cfc94f5", - "sha256": "0z3vlr56jmiwzlr5qjxmvcn8090jsj6x31xnv11fk6w7dqc4lrby" + "commit": "b5c54d9c8a1fdfdbf1a133040029a4924b69185e", + "sha256": "1snh1g7123f4vmjrcqjpw3a36jlysab5hxrf1jvl3r7ccxjdcm45" }, "stable": { "version": [ 3, 27, - 0, - -1, 1 ], - "commit": "5b39465ff1eaf8fa5be072cb6a52f53aa1e599a8", - "sha256": "011dnd6cjjccqgszbx989fk23zklm5da95402xgbl6rvi0y7ivxy" + "commit": "b5c54d9c8a1fdfdbf1a133040029a4924b69185e", + "sha256": "1snh1g7123f4vmjrcqjpw3a36jlysab5hxrf1jvl3r7ccxjdcm45" } }, { @@ -14400,11 +14535,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20220917, - 1349 + 20230806, + 1552 ], - "commit": "96dbaa43ff1326879e76a7943b8ae27265ae84e8", - "sha256": "161hd0nfwb6wv2ldml74kgzmpilb6rc0ldiv0vsqklvi781dsbr1" + "commit": "d34e8db507ee0c7b465ff18a8f220c33ed77cd79", + "sha256": "1mfildi7rav2j42avii7z4gp4ghl04cqv8wp1vyxzl8vkyj60nkb" }, "stable": { "version": [ @@ -14677,11 +14812,11 @@ "repo": "remyferre/comment-dwim-2", "unstable": { "version": [ - 20210101, - 1820 + 20230730, + 1619 ], - "commit": "b4d6bf4be5a159c4bcc7d43bea287315a16114ce", - "sha256": "12hh6c1n5m5nxjr87456p4y03cysiypqczwsr1ih88rcbhddn5di" + "commit": "69415caa1a381063d3e794912dfe88f672854ab0", + "sha256": "05ypgsdrgqj8105bvd17jn7w633y3ysbr5sgz33m7kj1ca7sl9ga" }, "stable": { "version": [ @@ -14796,14 +14931,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20220531, - 1301 + 20230616, + 1042 ], "deps": [ "s" ], - "commit": "c4aeccae5b4a073fc3f4e8bd780a2ebbb7d5e533", - "sha256": "0ph5z31hibsjy6711gwfxa1qmlyyg3fh3wvgsafsgnkg6mlf2h3h" + "commit": "35e2438eb7feeb28273c4920376fcf296cc83283", + "sha256": "117jkip4waw1vb4rqdg94wncqmza5p6b2x102xkcqhn4nf7f8vw7" } }, { @@ -14844,11 +14979,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20230416, - 2034 + 20230703, + 2021 ], - "commit": "8a78f320019574bc35b5727f95b052b27918da20", - "sha256": "1rmxcv5nfvp6j26zcv5fb563mzwf205s5417yqmfyc44v8j905i7" + "commit": "3ec40b0a0ea751b6c48f24abd58c8304deb53014", + "sha256": "05zmjxrzgjaqcalxh2gf0xd5wvhza5c5f4skkk36r7hhvz9z6915" }, "stable": { "version": [ @@ -16419,6 +16554,24 @@ } }, { + "ename": "company-spell", + "commit": "a0c251a567dc3370c4ac86d397fe1cd15d9fe409", + "sha256": "179xl5qfpzda1iswahq62ax2sy40inhqmqqikr7fa00qg2k75dq4", + "fetcher": "github", + "repo": "enzuru/company-spell", + "unstable": { + "version": [ + 20230723, + 2249 + ], + "deps": [ + "company" + ], + "commit": "34c3e40af2e8b97e137478d98c5982e3fb2ceb3c", + "sha256": "11k5kzbd8kb6r4bkwlrb7c7ail5414n1skrnj6lx7yxi803hbr0b" + } + }, + { "ename": "company-stan", "commit": "33fd0382da97c7397b1e4435860e7344d70399b8", "sha256": "064476s2gccjmwhrc406460k3aqc80giqqyjbii8243964rdx4p0", @@ -16746,11 +16899,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230521, - 1115 + 20230616, + 2101 ], - "commit": "fafadb6722299797a1de3de93cf7439d17b4d13b", - "sha256": "15jpnb6ndb4c6d6zplckanxndw0xr117g5bxwdmbyds8ns6xrm2c" + "commit": "fbf513c2e427ec1880b47dfd578128dff0f2083e", + "sha256": "0wa2f4m52p31dina83awh8xpl136dmgnp2fryclsa13pr71zw291" }, "stable": { "version": [ @@ -16762,6 +16915,24 @@ } }, { + "ename": "compile-multi-all-the-icons", + "commit": "d137a781874d564c5e5037663fae3073ef62c469", + "sha256": "087kqb4jklhjflw2vpglm05l8ls606ca2xl0ai8pkhysxalhjdv6", + "fetcher": "github", + "repo": "mohkale/compile-multi", + "unstable": { + "version": [ + 20230618, + 2022 + ], + "deps": [ + "all-the-icons-completion" + ], + "commit": "0625042d50dd629c62af8cdc5457fa9d7179468e", + "sha256": "05863s31hy00hpxfksm9dbky1r8yxvqg144n54gfifzrb4cz42g8" + } + }, + { "ename": "compiler-explorer", "commit": "28f8011009f8e92c020fe7599d9ede24b532e998", "sha256": "1kqgdld32pfbxhxyrcjshj8ip06r8kxd7znvpsba39fp9s2k0pjh", @@ -16905,8 +17076,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20230528, - 2355 + 20230620, + 1745 ], "deps": [ "dash", @@ -16914,8 +17085,8 @@ "pythonic", "s" ], - "commit": "f3ea3876eecd00a1fca16fd7fd68e56e3beac87c", - "sha256": "10brb5lg3fdfw840d4fw9db34vakxkbq0wq4ad16ab4qbw50aizw" + "commit": "6a6a27dad7ab696b41b54a1cb7591ca489133fec", + "sha256": "0hxas37xbcwrx981bb90hfj3an794injvrx8r0d34p581j02amsq" }, "stable": { "version": [ @@ -17069,25 +17240,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20230609, - 1654 + 20230729, + 2329 ], "deps": [ "compat" ], - "commit": "4e7f8c6e1840dbacdaa25c67d23a6bbd451ba2c5", - "sha256": "0ssjdi8axz27zznc40b1y13w6zbmhp5yiz9bqrw84fg4gidkfxv9" + "commit": "be4fdb6246fb2cada13459fbabae5dd0553e1fd9", + "sha256": "0h2rqpahfay4kk9gkq5agxmx4a8na2qm6ixkls6bnbrw411yykp8" }, "stable": { "version": [ 0, - 34 + 35 ], "deps": [ "compat" ], - "commit": "38af775c837ab09d9d2a77059386eb09c4254a4e", - "sha256": "1ggbvc5ylsw430w05fjl4vk1hmim45mwah7cyr94g03rwjhng1sc" + "commit": "fe49dedd71802ff97be7b89f1ec4bd61b98c2b13", + "sha256": "0a20rfqv2yfwqal1vx6zzg92qgr32p3rp7n6awnyb010jnykqszw" } }, { @@ -17169,6 +17340,25 @@ } }, { + "ename": "consult-compile-multi", + "commit": "d137a781874d564c5e5037663fae3073ef62c469", + "sha256": "0ha4lj9ck81fdiay1hbpd9h3lm8h081k3jq7vga2an2584122qwj", + "fetcher": "github", + "repo": "mohkale/compile-multi", + "unstable": { + "version": [ + 20230620, + 1848 + ], + "deps": [ + "compile-multi", + "consult" + ], + "commit": "111db49b4debe3f56b643a5917e14da3d0e36988", + "sha256": "1rjzbryggwc21mkiafp4dfcykrkhs7fbh082h10cs9jhn0z88x21" + } + }, + { "ename": "consult-dash", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "0ckz2075wmdyar30kxvl21m17b5an3k9aww3xca2cvgkjgl7dsk8", @@ -17195,15 +17385,14 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20221001, - 1748 + 20230725, + 2338 ], "deps": [ - "consult", - "project" + "consult" ], - "commit": "ed8f0874d26f10f5c5b181ab9f2cf4107df8a0eb", - "sha256": "0fkd4ybgh06x1ci4wqpcyvc3vw97v0qc5lzlyj9ycfgdqixym58y" + "commit": "3268ec3f7194c086ecfbd2863e029f42d91b77c1", + "sha256": "12mp2c7mx60l758c4gjnx4lv37fp1b8ifagak8l2dcmg2rm7kxd4" }, "stable": { "version": [ @@ -17260,15 +17449,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20230411, - 445 + 20230702, + 1115 ], "deps": [ "consult", "flycheck" ], - "commit": "fda630411ad9219f45136310f671b44eaefafcab", - "sha256": "0wq8qsdiq6m83pfa0jzxxb0rp81y867w0yjh6nxyjlhs56qv4206" + "commit": "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062", + "sha256": "0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c" }, "stable": { "version": [ @@ -17442,16 +17631,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20230419, - 357 + 20230706, + 2018 ], "deps": [ "consult", "dash", "s" ], - "commit": "4fce058f668945a0a532c49d585be763fa29deda", - "sha256": "12v8sj72krjff8cdqv98h1p4d27vng05h314wvmcxf8sgdxr334r" + "commit": "4d905df3b74a5a46ebf27ce601846e3adc6b8144", + "sha256": "17lz4bsp8vv9ksfg4a8d3kz2lz7qdpi81gfc0y4jvd9zllcafhnb" } }, { @@ -17898,6 +18087,35 @@ } }, { + "ename": "corfu-candidate-overlay", + "commit": "0b047d48b49fb38a29e93aa7c59563d19b2bde45", + "sha256": "0x5311s372s22pnal5j0lqizzrjixzky04lszabdj9vddb0whnc6", + "fetcher": "git", + "url": "https://code.bsdgeek.org/adam/corfu-candidate-overlay", + "unstable": { + "version": [ + 20230706, + 635 + ], + "deps": [ + "corfu" + ], + "commit": "b1f83e3e7598d199c4691d56c768125c8cd2d157", + "sha256": "00wrqdx2khl86h8n1ahqllk5p17ybc0b4w980yg6qdshpww86an1" + }, + "stable": { + "version": [ + 1, + 3 + ], + "deps": [ + "corfu" + ], + "commit": "0674824cb87881b86e9f20ae3ef1daba0e1a7b68", + "sha256": "17n61qqj25rs8v71sf3a1c2kdabn01balfayj6c1c8n7nbjqy20w" + } + }, + { "ename": "corfu-prescient", "commit": "72a84587636e291bee48d7e9ad5723791ad02d7e", "sha256": "1w7w88l43bpybgzdlp4b195y9y0mikp143wlki91s38m1hg0n0rd", @@ -17945,8 +18163,7 @@ "stable": { "version": [ 0, - 3, - 20 + 3 ], "commit": "e7ab6aa118e46b93d4933d1364bc273f57cd6911", "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" @@ -18006,15 +18223,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230410, - 1815 + 20230619, + 1623 ], "deps": [ "ivy", "swiper" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "aa18c1f4861cef2ddcf0c70b6fd7edd93ae9c627", + "sha256": "11c8874amlgfch2m993qyn4lrj05z3ij4dk2a4wvhj93x8hr0dr8" }, "stable": { "version": [ @@ -18545,6 +18762,25 @@ } }, { + "ename": "counsel-toki", + "commit": "9e4264fe2a79b7bbb28633a23ac7d171270feebc", + "sha256": "0v44h2hxjqybc4imnjclzl918v2kqpx8bh0ja6snifjdy1j5gcrx", + "fetcher": "github", + "repo": "emiflake/counsel-toki", + "unstable": { + "version": [ + 20230705, + 1638 + ], + "deps": [ + "ivy", + "request" + ], + "commit": "545aa4413ba8ce6a92d11d42e910a57a8cb58e2e", + "sha256": "1iaka9wkyl5hybnn7y00chi96b9vh5dylib5qnb1b0xxgn4dc7k4" + } + }, + { "ename": "counsel-tramp", "commit": "e1822b735b6bd533f658bd64ddccda29e19e9a5e", "sha256": "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5", @@ -18552,26 +18788,26 @@ "repo": "masasam/emacs-counsel-tramp", "unstable": { "version": [ - 20221228, - 1403 + 20230714, + 936 ], "deps": [ "counsel" ], - "commit": "f63bf0bc765480676094102013218254ea17727f", - "sha256": "1ni6yhxzg945akjmqww6h31jqxydgjpf16i8g9jar3wa5wx6jnpl" + "commit": "70dcc6b9da5e76fefbc92646e7d780b2a06ca93f", + "sha256": "10vbna3gkv3ml2bi64y80yqasvmyfhz96x66hjkiqdg6bp0xsbrn" }, "stable": { "version": [ 0, 7, - 6 + 7 ], "deps": [ "counsel" ], - "commit": "aa5acfc95cdfcfc2005bee31d8003fd4ae1d319c", - "sha256": "02dhchmyaqv6855mafjxizzgpl32rmnwdmw0nbm6rkckr13cgjl1" + "commit": "70dcc6b9da5e76fefbc92646e7d780b2a06ca93f", + "sha256": "10vbna3gkv3ml2bi64y80yqasvmyfhz96x66hjkiqdg6bp0xsbrn" } }, { @@ -19162,11 +19398,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20230223, - 2257 + 20230720, + 2043 ], - "commit": "ea2da3c7701542ca4cf703c7c29eb783269d18f6", - "sha256": "11dxr6152gpns08blxzmz1vnhnsjdyz1sgr8k6sq86phc1r0lplq" + "commit": "e5b54c3ad728d791772ceccca607d0434ddaf985", + "sha256": "0jzhr92fbf01z5gr79h5ck696apy5rr7bjblxda1r1anpjayahm4" }, "stable": { "version": [ @@ -19909,14 +20145,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20230116, - 951 + 20230805, + 925 ], "deps": [ "recomplete" ], - "commit": "3c1471362d6cb947daf6373e8def8169c21222fc", - "sha256": "0hc6x4s4sr8pi5w3ywfzfhp0m6mf0bxdb8j894r76mmksysmrak2" + "commit": "cbbd8721af0cbc84ba737d42bdf702d9a80fa3fb", + "sha256": "14iqia8802wjkvs9rx7jmchzzf4i63r31aanyzyzx8r7dv9nd6x1" } }, { @@ -20004,15 +20240,6 @@ ], "commit": "3e4790559d3168fe992cf2aa62f01423038cedb5", "sha256": "03kilbl9mp1hs7mpqb6vs6sbmhplpm4qg93sn1vhn34q710iccb0" - }, - "stable": { - "version": [ - 0, - 29, - 32 - ], - "commit": "c48361d0a0969206e227ec016f654c9d941c2b69", - "sha256": "168nanar3dlc9czrj7cklk78pmnqaah89zzp96rbnlxw2n20m62x" } }, { @@ -20124,11 +20351,14 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20211214, - 1251 + 20230717, + 1627 + ], + "deps": [ + "s" ], - "commit": "e18e84ccc13101f1609c213029cf011ae0ad1178", - "sha256": "0ylcwwp6asl3w9fmx46z822wpr4mrlr0mgny6n1hi3wnsvcjagka" + "commit": "060525c13eeb385b20898da93610dbe964f446f9", + "sha256": "0ang2cj4na3r5hf7pj35vnfc1x1g9c6fjvyznwcxfm8bjj91kpn3" }, "stable": { "version": [ @@ -20178,14 +20408,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230524, - 654 + 20230709, + 2036 ], "deps": [ "shell-maker" ], - "commit": "0118df8b2017c620608eae5226b9212977266d91", - "sha256": "13h22wzv4l8kx37b8cccpdlcjibjh38gbdjci4smygvyvng5jh5r" + "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", + "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" } }, { @@ -20252,8 +20482,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20230604, - 1120 + 20230626, + 1814 ], "deps": [ "bui", @@ -20266,8 +20496,8 @@ "posframe", "s" ], - "commit": "d8e9bcc3e48b8953289c57f895d6409b258f9a8b", - "sha256": "04gw48ww7kdp7ryizsqk727zh6jkfpqpqvvd6l3yaqy99hpdq4kq" + "commit": "450ef663a0e3333f515f974103d64fdc8e38ed5c", + "sha256": "1qj1bxyr8x1bw95dwx2q8bxwyq00f67bb6qcbvvx69q0rhil1d7d" }, "stable": { "version": [ @@ -20379,20 +20609,20 @@ "repo": "grtcdr/darkman.el", "unstable": { "version": [ - 20230527, - 1312 + 20230711, + 1806 ], - "commit": "c45f00455c1e0e0dbd8b6f0da593c9e4299275dc", - "sha256": "1g3cxc4z17qwlw6si0v3bdrxmgh4pnh9ivrl7z77ncpxsml1jw64" + "commit": "740d33a2b20efb59fc2ebd3b67f66c7ac4356b59", + "sha256": "0ld9qqi0n71vpmyz7l5i66d08864w18l3kqknxbj03dhmn4l6ri9" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], - "commit": "13417d14abb3affc20a903daddd2f1525671b5bf", - "sha256": "1bz8pcakny9zpqjr04zhqkax94km822k15rsbiy7r3w6j9vqvl7j" + "commit": "fa80face9fb6e6c13dc2a0d84631d770fbef71fe", + "sha256": "04sgm6ynj0ir914r3iyazkzppqfbqpci0xb7scvb7vm76a284w6r" } }, { @@ -20523,11 +20753,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20230502, - 1324 + 20230714, + 723 ], - "commit": "96eaba028ac069ea0e5cc70de15b0229126a054a", - "sha256": "0fxjli4ysvwygnkyxj6rb51z4b5ncnaavx2yq90ircc49pb4fgqr" + "commit": "f46268c75cb7c18361d3cee942cd4dc14a03aef4", + "sha256": "0ck6xwgbkjq7svqgzj3wddr20aqffwcxlmvdg0nj2i9zbksz8rkp" }, "stable": { "version": [ @@ -20626,23 +20856,20 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20230512, - 1839 + 20230726, + 2018 ], - "commit": "34a0076f01a729b4aae16947fa0d0e130cafedfd", - "sha256": "1y4h2hyqdw9fz17h1zawrs89mqv7baxndldzh9gb8a8gawxjy68c" + "commit": "6480e0797b41c8ce1de4f37ba8016d177c22ab04", + "sha256": "0vjrzh0w91nxbbij2yzdf0fn864s4fa4rklbqi6nqc93166wqx3l" }, "stable": { "version": [ 1, - 7, + 8, 0 ], - "deps": [ - "page-break-lines" - ], - "commit": "8dda82fcd4d0954f37a472ad68fb8df55195820e", - "sha256": "1qv4cqjy2s2d2bysbq10vq1axpbd8qc3jn1s1r81lxqkcja8zasa" + "commit": "a1c29c0bbfca3f6778022628b79e7eef2b9f351d", + "sha256": "1m39alr4vi22wr0yd22yi3qkdykwh8vmkdlbbd8qm9z1g7mvl382" } }, { @@ -20806,26 +21033,25 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20220629, - 1806 + 20230729, + 1954 ], "deps": [ "extmap" ], - "commit": "3505de8bd176056083a1da73226f9e77cc50c4b7", - "sha256": "1lzmij8hk7s2rj51yx88swvpj2dlgh9wnrcbpgzfh7l9sv22r3lq" + "commit": "cdbf5299359860f8f429b2ddf621e52a79901657", + "sha256": "0vlcwrkw7fxhb3xclflykrj2zyi75rcfrcw7a0g3wk88qpycf02q" }, "stable": { "version": [ 0, - 7, - 2 + 8 ], "deps": [ "extmap" ], - "commit": "3fee2884fad912e899a5ba47609bcf94532352f1", - "sha256": "10nf3y4abwkwvi4g11mdwi0dydy4kzfyv21y06dsxm1hc1gmq7zx" + "commit": "3065971ce81c8edb5669bf74ad1351c4d3492c41", + "sha256": "01byg5c6ffhgpaiccdg1g5fkh1hk92br3hw3hpjqpwwpj9skg4yz" } }, { @@ -20974,15 +21200,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20230328, - 1058 + 20230701, + 2340 ], "deps": [ "ccc", "cdb" ], - "commit": "98c103ed697e461439401f731c13b3bda02e5128", - "sha256": "0rz7maar62k7y7zd2i9105m8l0i0il18svlz5ij3zlq7djw3ir8l" + "commit": "8c47f46e38a29a0f3eabcd524268d20573102467", + "sha256": "0k97n084wahsfmnv6xq2rifkclazbqp8482ap36iswvlqcmpkxn3" } }, { @@ -21231,11 +21457,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20230116, - 951 + 20230708, + 1012 ], - "commit": "d52a31ba0860188ab27c58d1a3e2de62346700d5", - "sha256": "168rbyi3f5gp68qmlz4j57ly9f67wvfmjsw0r067k2vlgswqxcmq" + "commit": "21b0ab8e5363ad5b83df1458cca2380a8ebe318d", + "sha256": "1alfcx6dbbmshrm24yr17knr2gv0ais0f9qwkm02ja9rzcjkgrkl" } }, { @@ -21762,20 +21988,20 @@ "repo": "susam/devil", "unstable": { "version": [ - 20230607, - 1946 + 20230730, + 832 ], - "commit": "e9d2024b695b14a318f74f08774548292021fb69", - "sha256": "05icsnks1s3vimpqwq6ii73gkp4j9w2qifiwjxmh5pc0h30007ll" + "commit": "1985300ce84abd712be93b271b27c3bdb164231d", + "sha256": "1pr9yf6f37sz5qy1snn8ag5bvg6lza7q635jh8jhaqqfp37jvv1y" }, "stable": { "version": [ 0, - 4, + 6, 0 ], - "commit": "c87075a0cd087165f8528de6952263b4ef26858b", - "sha256": "1jpcca9sz94i8fpswa5axcky92h985md14qpy08f97p0ws8gvsi5" + "commit": "1985300ce84abd712be93b271b27c3bdb164231d", + "sha256": "1pr9yf6f37sz5qy1snn8ag5bvg6lza7q635jh8jhaqqfp37jvv1y" } }, { @@ -22002,14 +22228,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20230423, - 1837 + 20230714, + 27 ], "deps": [ "cl-lib" ], - "commit": "ac746a6e27e04a077c68a2ebe4f8750399286107", - "sha256": "18v7vh35psy7wilkijp468zh1gm92kd93ii7rlgwfxm3rk3k88z5" + "commit": "d9e34f7b8110b7f753c237d0d0b3f267f3ca4779", + "sha256": "1y32468c9mqanscml9igfi4ypmrfswa2vqk5i4sd94isk2rr9pa9" }, "stable": { "version": [ @@ -22561,16 +22787,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20221127, - 1247 + 20230621, + 1019 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", - "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" + "commit": "874449d6fc98aee565e1715ec18acec3c1c2cafb", + "sha256": "119m942a9p13l62w5wq2iprkvakv0c4xwfhq2yivhwb21rqmxq0g" } }, { @@ -23125,27 +23351,27 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20230126, - 1144 + 20230714, + 1459 ], "deps": [ "dash", "s" ], - "commit": "5496bc00f7a32a9d3e54e395f29d44e9df771567", - "sha256": "1qzzpcrvgg7m3b8gdg9mpvhhjjzhmcrzaf72hvmdihs8n0x36nvf" + "commit": "95607fc7eb84e792122b52d2b1d62f49199a2a37", + "sha256": "1zvsmpvham670i807rs8f2f0h73yk4fpaavj0hzksqcl5ykh4fgr" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "dash", "s" ], - "commit": "947a008387a939f466ca122bda2ea98bb17710e3", - "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" + "commit": "95607fc7eb84e792122b52d2b1d62f49199a2a37", + "sha256": "1zvsmpvham670i807rs8f2f0h73yk4fpaavj0hzksqcl5ykh4fgr" } }, { @@ -23156,15 +23382,27 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20221214, - 1215 + 20230714, + 1459 ], "deps": [ "dired-rsync", "transient" ], - "commit": "c0e2168b80df00116ab9071bb214cf05ed943d73", - "sha256": "1bkq5n7ivvfjcry7iaq9gv9fjx62brq6bs73j989b6jm32l6w3ns" + "commit": "95607fc7eb84e792122b52d2b1d62f49199a2a37", + "sha256": "1zvsmpvham670i807rs8f2f0h73yk4fpaavj0hzksqcl5ykh4fgr" + }, + "stable": { + "version": [ + 0, + 7 + ], + "deps": [ + "dired-rsync", + "transient" + ], + "commit": "95607fc7eb84e792122b52d2b1d62f49199a2a37", + "sha256": "1zvsmpvham670i807rs8f2f0h73yk4fpaavj0hzksqcl5ykh4fgr" } }, { @@ -23175,14 +23413,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20230216, - 432 + 20230623, + 1655 ], "deps": [ "dired-subtree" ], - "commit": "5569d3b53585f5413cf87a694650d0fd6e040803", - "sha256": "1vkdaw09vdjm583b0cdql991d76cqb1wkis3vzfhdy22hmy38wh7" + "commit": "85ec4fffc2607d38ec2e3b8577320aceb8e652dd", + "sha256": "09708kcbzx9v904rg49yg3xjix8kbkx89xsysx66imxh3s8f8xjb" }, "stable": { "version": [ @@ -23398,14 +23636,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20220812, - 956 + 20230721, + 714 ], "deps": [ "dash" ], - "commit": "268536f564b7eba99264a89a9149268eb4bc67ac", - "sha256": "1rfr6cby7syshs3fbk83hhb3s4mjp0pfxb4dkznm5sdp259s4rqs" + "commit": "14f74269af34f8c30ab4a521eff290b74460daed", + "sha256": "0q5n499vc7d57fyr98alyrfycdvwgykf2fia3jq090h6xn5jbjl3" }, "stable": { "version": [ @@ -24458,6 +24696,24 @@ } }, { + "ename": "docsim", + "commit": "1f669cc4f79d2da48dc2db25e40b391e29630dd8", + "sha256": "0kcwkwfdjgrijap33v1d34wrrykq0bgxdqzyyimijvsfkx49lal6", + "fetcher": "github", + "repo": "hrs/docsim.el", + "unstable": { + "version": [ + 20230627, + 47 + ], + "deps": [ + "org" + ], + "commit": "069569deba0f08906a42274ade321120b433f39a", + "sha256": "1bqvm7bg1pmd34x9s935gfahlicw7vyr3jjsh5pvnxh7sba3lamx" + } + }, + { "ename": "docstr", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "1jyhs8gdy82jiz9p38wgarm7s7c24r1lgcdz2mdxwfvfnb72pwxl", @@ -24628,16 +24884,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230530, - 754 + 20230806, + 952 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "a16be08123852767c2bdc27eee4b4761cca973aa", - "sha256": "1i9ddjvd433mpdllvs4zwn2w3syd4m9lync5w4zid23rprz01ga1" + "commit": "07bc0220582899cbecaed7d182c8ee9a9964acde", + "sha256": "1s5f5hg97fpr0i3k81dnw12xgqykj4rcic6mw82nlhsb9l5a0h5b" }, "stable": { "version": [ @@ -25172,8 +25428,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20230516, - 1745 + 20230601, + 1417 ], "deps": [ "cl-lib", @@ -25181,8 +25437,8 @@ "s", "seq" ], - "commit": "9d494f8281d5cdf166b91a219a8b9a1558fb51db", - "sha256": "02rxjcvl8h0qvylsfy19v9l9dyi32r8g0wrgm4jcs357gmcxyay2" + "commit": "c3214bcab4076ac7855a19b52a2925e279477e8d", + "sha256": "07iq0870yjl65d0kdw8ss8inckpf3q2gji7zs0nfqxpybkwv4nwb" } }, { @@ -25208,19 +25464,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20230302, - 2151 + 20230725, + 1615 ], - "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", - "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" + "commit": "69d8e93c33050b073228be2e8ec0b3ca52989f9b", + "sha256": "1d9bvbw31yrp14yl3yypwbxybdhzl3ybjiprbh1qcniv929lnydq" }, "stable": { "version": [ 1, - 9 + 13 ], - "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", - "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" + "commit": "69d8e93c33050b073228be2e8ec0b3ca52989f9b", + "sha256": "1d9bvbw31yrp14yl3yypwbxybdhzl3ybjiprbh1qcniv929lnydq" } }, { @@ -25290,16 +25546,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20230517, - 2053 + 20230716, + 1717 ], "deps": [ "dash", "popup", "s" ], - "commit": "90130b85fec948acb7c6f623d2c3982533955bf6", - "sha256": "18rva7q0x11pni4spa6fws1mpgbfh74j76lxan6axkm9cfnqimch" + "commit": "d9503c157ab88f0ed2fa1301aeb57e95ac564760", + "sha256": "1v19valcwxn987bq698kd78hxyq4ri0m7s2phzbw3fm4nl65q3i8" }, "stable": { "version": [ @@ -25339,20 +25595,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20230402, - 1815 + 20230731, + 1217 ], - "commit": "e53368337be3c353fd654bdbead322605fc875c5", - "sha256": "1x3z9wr1zfncd39ya3bqlfbq54hsv6a1kik8x1snsr6qbsy1an79" + "commit": "fc382520272012638088848d7f3dd1ef6687a284", + "sha256": "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606" }, "stable": { "version": [ 3, - 8, - 1 + 10, + 0 ], - "commit": "a340b806a6ec2da97c481c64011bfab7b71213a8", - "sha256": "104kd4ns0fwjjfcbm30xhd4a3k42kvj4xp8bds4m6c9sgsz30xwg" + "commit": "fc382520272012638088848d7f3dd1ef6687a284", + "sha256": "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606" } }, { @@ -25446,11 +25702,11 @@ "repo": "sadiq/dwim-coder-mode", "unstable": { "version": [ - 20230602, - 334 + 20230801, + 403 ], - "commit": "c8c5b3981bd44bee7ab59eb0a686c8841975a2c3", - "sha256": "1fzg0vz2s12rd9sq8pkx2dflbpynjazzj6kvsz248b03r4kc8k0g" + "commit": "271d9c06ecdfadf19e0eaa788c8b90626090d4c1", + "sha256": "1qssz8crzj5q8c6r4fd90ynl5jsi7drq6pkmv0a82kllzvrqvqrq" } }, { @@ -25461,11 +25717,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20230527, - 1441 + 20230730, + 1153 ], - "commit": "3b136205359f002934bef37b8358cbc4e1df2fb3", - "sha256": "0xvzr4riisiy30vm9967i6i58bsxnh5q7y6aqi3fkvfaqr7y4d9k" + "commit": "e91cd45b1bd0173e6d6a90079a86f13f2bfd79b7", + "sha256": "0w2z4yss5918gj2vwzfv557190jlc33r5fdk9j2339s757mvmgbn" } }, { @@ -25606,11 +25862,11 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20210924, - 2026 + 20230619, + 1854 ], - "commit": "76142cf100d9e611024638a761e62bd82af156cd", - "sha256": "1fsydk7pld2xpmmp1jnm8b3y7zdynibwicgmsfxpk11915y4fh6r" + "commit": "909a64aa96f09b05fe59d5703f7e0ad22d161bb5", + "sha256": "18vf0646wqnahnc7rj0wzq9shd1g69hr5j35psgcdzkrczma16m7" }, "stable": { "version": [ @@ -26676,14 +26932,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20230526, - 2314 + 20230802, + 1505 ], "deps": [ "nadvice" ], - "commit": "d4111f65c68f18f0dfb3072ee0d9b1d4cee80b52", - "sha256": "0bpfyhv6wdi3jpmx0wlssi7iz4y5f7jybjf43kys7ngm1k063fxb" + "commit": "df0e5180db1d1267c9ea39abbe98b7993e83bae7", + "sha256": "1d2xpqc9c6gjzkrhgvnl6r6ilksvz9ayn44gfl5z3aqdvzf9507s" }, "stable": { "version": [ @@ -27132,6 +27388,25 @@ } }, { + "ename": "eglot-tempel", + "commit": "fb8f1eefbeed8fadfaeb287cb12fe34cfad415b9", + "sha256": "0yv5rpd1w05ia6clp3j49ymm21z2wiss4js6h52s5bi770xi5vbn", + "fetcher": "github", + "repo": "fejfighter/eglot-tempel", + "unstable": { + "version": [ + 20230626, + 1004 + ], + "deps": [ + "eglot", + "tempel" + ], + "commit": "70fee6ac33df7a6c5cce967005766b6702a9e9a5", + "sha256": "062lkwbpxm97pw2hnrr0kpgk09g2bc41607y1f94gvgz51xjcxml" + } + }, + { "ename": "ego", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj", @@ -27200,8 +27475,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20230426, - 1857 + 20230622, + 1757 ], "deps": [ "anaphora", @@ -27212,8 +27487,8 @@ "websocket", "with-editor" ], - "commit": "87f444838f076b6926ff02ffab3fd5b0f67af2bc", - "sha256": "09nnr02v0nxpkwvn85pn8pd18lzzvms4vxb9qjzhnbws5ipckld8" + "commit": "32e2681d01fefde34760795b514cb98cb8a750d4", + "sha256": "0li52k23j9aw1j223bj6acns7rdgb8fr3v4zm59bkrxjwbfnqwxr" } }, { @@ -27248,16 +27523,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20230228, - 102 + 20230702, + 2048 ], "deps": [ "clomacs", "dash", "spinner" ], - "commit": "29308faad38e9cabd98fb5a8450df15db1e4a4cb", - "sha256": "0n3fwhj760d4cvlarkmnmys303iahrk5643wypc7p0qaai181z3c" + "commit": "cfb2a3b00d16c6b8575b84d4963ac0c21f91fa05", + "sha256": "07b4384cgpbx98438jay5py6yir9q97djs7a0458ss9zmphr31d9" }, "stable": { "version": [ @@ -27298,26 +27573,26 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20230519, - 1717 + 20230620, + 1807 ], "deps": [ "triples" ], - "commit": "da6a3b3073374e868f157fe7dc24be7b889af8fd", - "sha256": "0v61w3r847jivqiw2zy3hb8jiixn4gv6yfns6brvj1j7dk0q503w" + "commit": "9fa918ae4b3a7a8541e570fc358174346d875e85", + "sha256": "0zcwryxskaz3b7bfyw7651sf5rgnf1dgs9yr7mk3d1g6kwh38q2q" }, "stable": { "version": [ 0, 3, - 0 + 2 ], "deps": [ "triples" ], - "commit": "da6a3b3073374e868f157fe7dc24be7b889af8fd", - "sha256": "0v61w3r847jivqiw2zy3hb8jiixn4gv6yfns6brvj1j7dk0q503w" + "commit": "9fa918ae4b3a7a8541e570fc358174346d875e85", + "sha256": "0zcwryxskaz3b7bfyw7651sf5rgnf1dgs9yr7mk3d1g6kwh38q2q" } }, { @@ -27351,11 +27626,11 @@ "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20230210, - 1311 + 20230624, + 2 ], - "commit": "0142f58f075ea39aa6cc7ed35dd599afc4b6b450", - "sha256": "0d15zpbymi8k5bacgl6iyy60vzx2783qqn72cd7gszyxf6kz2695" + "commit": "7907fd7829ca55b21a62d23c17066fdfde9cd07c", + "sha256": "0b2z767j9cdv2a7n0g5x4zxjp9jim9q2lwcvyxddq82lrqy75ych" }, "stable": { "version": [ @@ -27390,11 +27665,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20230101, - 1231 + 20230618, + 1453 ], - "commit": "3969e02b2755d11224b80d2db9d2b8fc5ae73711", - "sha256": "06dg7yfnqfs96702p61015988jcsmfvixfv8kwkj0r0jjmn7l24g" + "commit": "cd998078949db70b736c0c3ac77ec23d97686f9a", + "sha256": "0d4kd1hpb4pqz6hxw6kc02gxv3cqpbnn0afqf5ajik4hlspwzd2y" }, "stable": { "version": [ @@ -27789,11 +28064,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20230601, - 1545 + 20230627, + 1213 ], - "commit": "05d41ea1f9d4219255fe64b9ab189fe25344d48b", - "sha256": "0qljnb23495i7brayqw4hwm39zfcd1m1b1ppyf454gp0168jxn37" + "commit": "bb12802f1f1e34345c600f69111c1a53bf98185e", + "sha256": "1pgnnm12pd5y67lcnzwd2f4b0cc2kaxxvzxb7a4ipb2gb0vwy3if" } }, { @@ -27838,20 +28113,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20230606, - 1809 + 20230805, + 1640 ], - "commit": "e6a2f6e523a8ddfa75fb99c27e4f416faa808eb3", - "sha256": "0w71h6642aigr5zhmiy3gs2mbngpbshrlgkjmflb8dmcyscipvvw" + "commit": "5ac5f26869cf4bcd96adc00edd254a845197e77a", + "sha256": "09la42dr6pkxrbsrz4gzcf5bwrmcvyd7hbmi4fs5jfabfya2h2kp" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 2 ], - "commit": "2307625a4953f3706608f0dae7c3e9dc3444f8bb", - "sha256": "1vvqs8x2chm2bgwnlsrq7llgql5m9hjbxi1x3xbnzbx5l1yvldbp" + "commit": "6d01211cb75fc590e5216679bb586b8c5ffe4d7b", + "sha256": "0k56rpn7k24rff48a10gsxh1p0lhb7548kba5p7z5x4s7lhvzvsm" } }, { @@ -27862,11 +28137,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20230610, - 700 + 20230803, + 51 ], - "commit": "049eacfd9808c446d93891b4d3332f5d62c0c053", - "sha256": "0phyg0b18cxhjq8wh1xkm1c59vfv9rps8r1maalsvjr2v83n6pcv" + "commit": "b5aa4814326f592d15332c5da4e62ed513fa85d7", + "sha256": "1p5ffjblpz6cmnsp6km3mayqzvs2xcy1sqyxqz1zwjm7z8fzfma0" }, "stable": { "version": [ @@ -28057,11 +28332,11 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20230325, - 1518 + 20230719, + 1531 ], - "commit": "55fa59592d0d3e929bd8646ea691a592965a167a", - "sha256": "0lnyxjkqankqij23bpql5lwgz0iyn03xyjl7nps0as6qsabbfldr" + "commit": "8bf02159c2658a08198b2765ee979e930378956c", + "sha256": "08ph91dglwf3i0jrj7aw83kxvqa2q4m7qiwfvsb86h1ilrrnqmwp" }, "stable": { "version": [ @@ -28183,11 +28458,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210822, - 2129 + 20221108, + 755 ], - "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", - "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" + "commit": "55fb162fa27e71b88effa59a83c57842e262b00f", + "sha256": "02cqgrhfaxc73j250jz70q83l50ynhfxszg6kyb4g7fv9kjdagh7" }, "stable": { "version": [ @@ -28339,26 +28614,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20230506, - 1524 + 20230728, + 1433 ], "deps": [ "elfeed" ], - "commit": "640ffe17730b0024e873c634a1ef83966a45a018", - "sha256": "0d0dxldafgk3knc0d8g8ghm24zsq5x2p1pswh2syyl33nqf61s8s" + "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d", + "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q" }, "stable": { "version": [ 1, 2, - 6 + 7 ], "deps": [ "elfeed" ], - "commit": "640ffe17730b0024e873c634a1ef83966a45a018", - "sha256": "0d0dxldafgk3knc0d8g8ghm24zsq5x2p1pswh2syyl33nqf61s8s" + "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d", + "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q" } }, { @@ -28401,15 +28676,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20230430, - 546 + 20230627, + 1930 ], "deps": [ "aio", "elfeed" ], - "commit": "3ac12d76402bf192de8ae3b18997f9a52726379f", - "sha256": "0vy9dawsc4mr7zrcklym9kpzj7mmiy10nbbb1j1r29r5ml3jyw32" + "commit": "3f801e340ee92e4850486fea5f08bcbdbc89254c", + "sha256": "1zm35xc3vswr5jkf4yj6dshc7axk2dgxsq02v0hk9i149ga4ygsn" }, "stable": { "version": [ @@ -28573,11 +28848,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230521, - 2304 + 20230731, + 1350 ], - "commit": "90b81d0b02e8fa7b2ff0cc84ef90f95d1d26a691", - "sha256": "0vs11yv23jf4ka2lrbmsw85lxyl9w83wxin2vz3jncbaw8grvvpp" + "commit": "f2bd5119861bbcd3ebada76d44441ce96de49bed", + "sha256": "1r1260jsr6gicnw8papm4xsnpjl8yfl7ga7cm18284qjwkqqrm6n" } }, { @@ -28621,11 +28896,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20220903, - 1232 + 20230726, + 2059 ], - "commit": "792be709c82101aea0585ece7429e2fdded74494", - "sha256": "1gw2kvfbkabngsmj3xvc5r7xxmhzib7h2zx3cndvim01i6a1sklw" + "commit": "8d0cd806b109076e6c4383edf59dbab9435dc5dc", + "sha256": "1yy9gsm16zss7z9prd21ag2dij186r9jpwza463vqd93s2rivzkx" }, "stable": { "version": [ @@ -28815,23 +29090,20 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20221017, - 2044 + 20230626, + 1738 ], - "commit": "4974ff9a83daf50f2f03dc0d6d00871296e088b0", - "sha256": "1cc8qmfiz6azm7ly22cjhv7mmf5crmnfk3gx6315h0lz6rqh2885" + "commit": "00d6580a040a750e019218f9392cf9a4c2dac23a", + "sha256": "0xqwlahy2m5b3h7jx0ksy970clqm253mn87jhq9xvbggvbvczp6l" }, "stable": { "version": [ 2, - 3, - 2 - ], - "deps": [ - "pkg-info" + 5, + 0 ], - "commit": "c548a84e69787bcd04e0821351009c4448c96cac", - "sha256": "0f2a360h8bizvqk6bmgxm59g8n7id5rzwlbv6d383h15w298mcga" + "commit": "00d6580a040a750e019218f9392cf9a4c2dac23a", + "sha256": "0xqwlahy2m5b3h7jx0ksy970clqm253mn87jhq9xvbggvbvczp6l" } }, { @@ -29173,11 +29445,11 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20221201, - 1227 + 20230804, + 449 ], - "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", - "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" + "commit": "e7645c5d588591d0e566d56df53ec6f0b2df53f1", + "sha256": "0r7cy7xpbiqdi2qqrkd0z2lifdi9kjws4kmc36hrhjhbsibq5kaf" }, "stable": { "version": [ @@ -29278,8 +29550,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20230402, - 1946 + 20230803, + 1455 ], "deps": [ "company", @@ -29288,8 +29560,8 @@ "s", "yasnippet" ], - "commit": "840713f23af99b83d04034c3703f7e73c3baa7dc", - "sha256": "1crkqy3dyvmqbyzyzl4sknhv34jckvw5lrgr9ryyxicbbhxm20nz" + "commit": "7ff8ffa918411887d165764f7a5a12bc46646e73", + "sha256": "0lh8w5a1abxaa7lf1c4yzgr0sh9szcwdnwd8w2004hv6mrcmyqc6" }, "stable": { "version": [ @@ -29364,18 +29636,21 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20230318, - 2024 + 20230621, + 1005 ], "deps": [ + "ansi", + "async", "cl-lib", "dash", "f", + "lgr", "lsp-mode", "trinary" ], - "commit": "2aa912dcc7d3732ba04eb96ab1cd186565a48f98", - "sha256": "052fkmq71wv2z8si02jnp992yjqff39kyfm27l4vyzap83mdaw4b" + "commit": "f719e2404ab6f3323df9341751469cb2e413e013", + "sha256": "1098li76wz3g9zdmrl65a93ba39dqd3dqmnazs477bmyjfc6lxyh" } }, { @@ -29650,11 +29925,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220831, - 1636 + 20230706, + 1152 ], - "commit": "e1b701894196b0e0aaf18ab88c778877ec87d0c9", - "sha256": "1ycq3l757qs4scwi9cn1sjmr8s5hr8dalqdm297ri1dpr6lba063" + "commit": "44775589ad050134adf433885be0a94398055630", + "sha256": "08r91hq82j44lksv23bdm0gxmb5xq4j70dr8z0lzbzvwwfgph8hy" } }, { @@ -29983,14 +30258,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230605, - 550 + 20230805, + 1458 ], "deps": [ "compat" ], - "commit": "de4b37cf2a4cfc4e755da3447ed6336798dfe6b7", - "sha256": "0ii43lzzv106nb2i6dsxzrxvcq3kr2csnpdh0hlxzzaj2z1k49cz" + "commit": "d8bf793f478e2f7b314c90edb188fa3ded6dc6da", + "sha256": "0brc20ikkvlhf2c62qyrkbd06l4lzzkx3caifs37v2qi681mm4nq" }, "stable": { "version": [ @@ -30012,15 +30287,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230503, - 1055 + 20230616, + 2243 ], "deps": [ "consult", "embark" ], - "commit": "6bacd160032f1ff59812268df9d215ae04f3d02b", - "sha256": "0x06f0dfj8z112k2pzw65gpp0fnglzs6hiajrail7mcf88k0vx2w" + "commit": "b48412f62c07e056425044e7d528a0aae2ee8d8b", + "sha256": "04r563c902vyadl23ks1s8a677ydrldwyapjzbbpafrywr19hw24" }, "stable": { "version": [ @@ -30188,28 +30463,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20230525, - 2038 + 20230727, + 1543 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "315051ec706c982e2b9f6fe225d06eaaa949bd74", - "sha256": "0ml7qzm9kwaakmlp2rhyjz90m6cxmq45lvr00bgzj2l4as6cir33" + "commit": "8ad5cf981b24cd9c7748232a843fafd2d62f6e15", + "sha256": "06xn06srkv54midyrhdbbnmgmlk4j8djqdm80ji8d62h99a05yyh" }, "stable": { "version": [ - 15 + 16 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "0f4bd0c551b6ec1debfa834464f28030ce9c287b", - "sha256": "1mlvpfm3phmcfna1jnmpjw3q0dxa6ah1dwbarjmgqq15rrjs1841" + "commit": "68fb73cbf7ca030506c585cbbe03efbb798f27e9", + "sha256": "0mx4qzdkz8sss61fl6vimsm4fd8h7jmcrhflibm1dbfaxalbp9rs" } }, { @@ -30566,23 +30841,26 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20230508, - 23 + 20230805, + 1633 ], "deps": [ "s" ], - "commit": "587c440905991fea5975148d6e9da0b2fdad9e65", - "sha256": "1v3mhf3dij5sbh3faf755aadl6phi0r5d1k7yqjj3hcxfqg84a80" + "commit": "60df27d081735a65d63c0c64207fd9a0a10683fa", + "sha256": "1mb1p29z25sdja3bbm7akh0ca40q1d6b3m44qb8qvikxpb6wkj13" }, "stable": { "version": [ - 2, - 1, + 4, + 0, 0 ], - "commit": "5f06e038a98aeadf5e309b95c2bc0ec94355e7e3", - "sha256": "15svjgilmzlk2dpb81mm9w7226hzzz96k8ajrg1bdg1p1s3b8vb4" + "deps": [ + "s" + ], + "commit": "449b6e3e00b2a2e28580bb7608817f203380b53a", + "sha256": "02vrvwgd1fba8986qc9idi6b6iinn44aid8jawvrz21visfzfmmg" } }, { @@ -30700,26 +30978,23 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20230516, - 1526 - ], - "deps": [ - "cl-lib" + 20230619, + 1503 ], - "commit": "fae1bd4fdf7d102744505bf2a8f4dc88d5b8f2fd", - "sha256": "075kqyclxp42myva01drpc6v3lk5cmghqw52mkn03wsbavi40khf" + "commit": "687266bff45cda00c1de57a22ad2b03de6823c28", + "sha256": "1d29da3giy9jmp2njxp0axpqr3nyv71na5ddqb6agjxj026518i2" }, "stable": { "version": [ 2, 2, - 1 + 4 ], "deps": [ "cl-lib" ], - "commit": "a5f1ae2b087109f37a704c496942cec9d9f48698", - "sha256": "11ls3wrvfmcz61pps438x772nk06rqff91s3xi5rzc3n2hkl1ayb" + "commit": "67b68c1a2bff48bad2cc4722598da0f36e3866a9", + "sha256": "1q4rwp0rv1azabhx5l3pnxdja2911815k6ijmfdx6s3vwyvd2wyn" } }, { @@ -30868,27 +31143,27 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20230608, - 1240 + 20230804, + 652 ], "deps": [ "inheritenv", "seq" ], - "commit": "d4d880faf51a3ebbfc2d45633c6c5ff6d1bc8c79", - "sha256": "0ikg147s9pbd8ziglcylj5xpnr3ssl2rb71bn2h1f307p9d2xkn6" + "commit": "d8fe5d293253a0d431034cd7294e6fb561c4950f", + "sha256": "1a4ixhvs53ymcm0fjlvnh47rd0sp23w4ngns4m0ydcs5vq8hwq5m" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "inheritenv", "seq" ], - "commit": "1954e8c0b5c8440ea9852eeb7c046a677fa544f6", - "sha256": "0vjk8k5k9xsngk50nf611c4j0bikqn9l1y3m35s8y3knwqw22ii0" + "commit": "d8fe5d293253a0d431034cd7294e6fb561c4950f", + "sha256": "1a4ixhvs53ymcm0fjlvnh47rd0sp23w4ngns4m0ydcs5vq8hwq5m" } }, { @@ -31013,8 +31288,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20230513, - 2035 + 20230730, + 2121 ], "deps": [ "closql", @@ -31022,8 +31297,8 @@ "emacsql", "llama" ], - "commit": "a72903cf2e7234a745b5ec4aac12a1e3dd85ea09", - "sha256": "05bwcvpy6c7zyimwwz5gcb0f3nqhahhj946vgnda61g776kcczpi" + "commit": "dfb66853b1dabdbcda1c4565db418a644968da7d", + "sha256": "0hs1zlknm9qv29dp2a5dmsygq7l531zbd91axn4f3wl2sb1bmx5c" }, "stable": { "version": [ @@ -31680,10 +31955,11 @@ "version": [ 2, 6, - 3 + 3, + 20230805 ], - "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", - "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" + "commit": "d4e6bf47156784efc1e74d0f0f2eeadc90a5611b", + "sha256": "0mxqliq5lyf8c1p77p54xrgb2fnnkk6n9miv59snxvhcz6s1yh77" } }, { @@ -31726,20 +32002,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20230608, - 533 + 20230628, + 1002 ], - "commit": "b54b86ad4f1253f46fd4552a73923756660c1d53", - "sha256": "1dp22fnwn86bzvldz4qxf2pqcb8kmn6hyzz8rbv650s0g2xlkw5s" + "commit": "d051172925a5c84b2f21850a188a533f885f201c", + "sha256": "1l1r4ya64lzvj63vykjyh6hkqnpym2lfbjn0l5l9hyyljir7yc8v" }, "stable": { "version": [ 26, 0, - 1 + 2 ], - "commit": "b54b86ad4f1253f46fd4552a73923756660c1d53", - "sha256": "1dp22fnwn86bzvldz4qxf2pqcb8kmn6hyzz8rbv650s0g2xlkw5s" + "commit": "d051172925a5c84b2f21850a188a533f885f201c", + "sha256": "1l1r4ya64lzvj63vykjyh6hkqnpym2lfbjn0l5l9hyyljir7yc8v" } }, { @@ -32699,11 +32975,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20230419, - 1527 + 20230803, + 600 ], - "commit": "5c4ae91cefa5c56fd13b204a9a996825af836a67", - "sha256": "0riv971cblala39kh5zz69833nh4ngpqdiz5ci7hjgyq8qcimgp3" + "commit": "d3e1a54020bbb96e15376aa3e7099b2f3650f79f", + "sha256": "1zwawj6412nr9yrgrkzh01xkwzj7bsq4mk213yp74klwrnd2vh5n" }, "stable": { "version": [ @@ -33031,11 +33307,20 @@ "repo": "emacsfodder/etd", "unstable": { "version": [ - 20221003, - 114 + 20230711, + 547 ], - "commit": "f26f603d088631ce0466aa529de7156fa94ffbc5", - "sha256": "0x9pdrarbddd240nwxwi487l66m2w496mq1sqf6ghw778sjy9yda" + "commit": "65f713935c9d2598f6fa4674bf2bdac2169005a9", + "sha256": "0vsqnllmaq48k9r806zs3kx5bp8jn19hgfgc0bq73dc388jf7fv4" + }, + "stable": { + "version": [ + 2, + 1, + 2 + ], + "commit": "65f713935c9d2598f6fa4674bf2bdac2169005a9", + "sha256": "0vsqnllmaq48k9r806zs3kx5bp8jn19hgfgc0bq73dc388jf7fv4" } }, { @@ -33177,16 +33462,16 @@ "repo": "kaz-yos/eval-in-repl", "unstable": { "version": [ - 20201121, - 1341 + 20230805, + 2125 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "2abb9ccf6f08ae3a5ab504f0b3fd81ce0345b766", - "sha256": "1707c7v6n2w94nnlb6n08y2m11bh7abm6fks2zrf0i80srxb8mrk" + "commit": "a57c6a790c0ca72b0d1218b837d3114ef874dd1f", + "sha256": "013g72lxc2qpk55v9c4im1977imiw0gc1l78srimpgm117jjhs4x" }, "stable": { "version": [ @@ -33332,15 +33617,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230608, - 2150 + 20230806, + 1536 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "1d37abaa9e9da89c6e9461804595e338b5ef3585", - "sha256": "1n15mnhqjvj970i19xzdas72dhl3vi7c4p67wvq2y0px4vz2pasg" + "commit": "2b1e18552216a05014fa5ffe4cb54f595b1008a7", + "sha256": "1qwx2lym90225s1ckzjhnx6m9iv1k7h09zxg6a279kzrx4l03qn3" }, "stable": { "version": [ @@ -33533,15 +33818,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20230530, - 1639 + 20230724, + 1631 ], "deps": [ "annalist", "evil" ], - "commit": "4cc676efa2ee18a1e95f1572734cb084e5b76646", - "sha256": "0hancr6dmx5faawz19zid9xmxg8wyjsk8zgb4w4bfi0k6jm0iwvg" + "commit": "286d69de179cf70c00963a998a4beb826b51414a", + "sha256": "1a91n86arx99f6qf04h9ffj2adp5r4jb070znfy9l3w7m07b4564" }, "stable": { "version": [ @@ -33845,14 +34130,14 @@ "repo": "edkolev/evil-goggles", "unstable": { "version": [ - 20220112, - 1302 + 20230630, + 754 ], "deps": [ "evil" ], - "commit": "1b66053ea5f06b08a52bebdd42bffd8eff82032b", - "sha256": "1z0qdgvrjajf027zibvwwaa2ia1zczbw68mc67ihhdc2zdsmz5ik" + "commit": "0070c9d8447e1696f8713d0c13ff64ef0979d580", + "sha256": "1pc6impc9x0m5j1b5bib98d62bnkn034lyhfx45rcwgnixaz7vlq" } }, { @@ -34081,20 +34366,20 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20230325, - 618 + 20230625, + 302 ], - "commit": "3b12ed55d67bb70e8957c0c7fdad4ab4ad79eb2f", - "sha256": "1ww4h4caxpb5hnq8hvdjrcb0ai2smcxywi1ms3mr5vcamrawk4hx" + "commit": "f27b2a87bab75e3b8a87c277049a4363cdfcbf61", + "sha256": "0igz4kcfb01f9h49n5x9p1idzap54nkw62i1xrql1zlj54s8rv6b" }, "stable": { "version": [ 3, 0, - 0 + 2 ], - "commit": "7a2a7384b6e752a805d6fbb78cf9425e54c2b18b", - "sha256": "0a55hhqi14g0hy80cfi5anxs44rcdxm1jkkyl561b4d4g823bpbi" + "commit": "f27b2a87bab75e3b8a87c277049a4363cdfcbf61", + "sha256": "0igz4kcfb01f9h49n5x9p1idzap54nkw62i1xrql1zlj54s8rv6b" } }, { @@ -34210,20 +34495,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20221207, - 1245 + 20230625, + 254 ], - "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", - "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" + "commit": "3b197a2b559b06a7cf39978704b196f53dac802a", + "sha256": "1xi4sd75pzhgcd9lzhx18hlzbrwh5q9gbscb1971qn94mzxwd60r" }, "stable": { "version": [ 3, 6, - 0 + 1 ], - "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", - "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" + "commit": "3b197a2b559b06a7cf39978704b196f53dac802a", + "sha256": "1xi4sd75pzhgcd9lzhx18hlzbrwh5q9gbscb1971qn94mzxwd60r" } }, { @@ -34738,14 +35023,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20221229, - 1650 + 20230627, + 2052 ], "deps": [ "evil" ], - "commit": "f273821f575ace519066fb106ee45a5b8577475f", - "sha256": "10d6q25m5wly4iysyybkha9y8mlfikqb2smra1zy6xvkxyx5mclr" + "commit": "4a21d756b76a50e0c0619555836c9aa98f103d3d", + "sha256": "1ja7fylbd6zmgdffkf5nvj7f5xyd11a9359q5wfqppd4jyd8c024" }, "stable": { "version": [ @@ -34856,15 +35141,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20221127, - 2033 + 20230715, + 1752 ], "deps": [ "auctex", "evil" ], - "commit": "3e0a26b91a1a56b0f35cbd450d01431057551750", - "sha256": "0bkr7hgwf0zi359l77r79dns2zx8xnb8l9h79hk20bn00d0dlg7v" + "commit": "5dd1e852c8fb9e6efa2b748e89786526483e7619", + "sha256": "08q8smiw7wgbwc46mynqv5xlwh1jjrpk9nmiaxsvvganay1qn883" }, "stable": { "version": [ @@ -35035,14 +35320,14 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20230604, - 1018 + 20230704, + 1451 ], "deps": [ "tree-sitter" ], - "commit": "7f310147cc9d9d8a2f2bdb732976fa08688e4f65", - "sha256": "07skqy73qb96pbpihy1s2c4f37412cigwq5b8c6b2irplh6c0c6w" + "commit": "e8bb9d63deeb2953ff9600e1633de667b3d7673e", + "sha256": "1fwj7ybzmdc11arcagsms7s0z8wndzr2wj6dqc9p4zxfviccck3n" } }, { @@ -35053,14 +35338,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20191214, - 558 + 20230731, + 212 ], "deps": [ "evil" ], - "commit": "05e201cd63b549e3c88b5c3fc9b264bd6fe5a42c", - "sha256": "0vadpy2whcgx08blyb4vw6wq3nrxdl03zv85lp37pf3mdk9kwmga" + "commit": "d4c53bd6addbe1bce7c77fdc10314f24451a2ecf", + "sha256": "1aih7rb2cs1cdqvmncchv0hg1rv1q5y685a1hb0pv9acs5kcdjxm" } }, { @@ -35134,6 +35419,37 @@ } }, { + "ename": "evil-tutor-sc", + "commit": "35a5fc3e7c3e8f74bb79f4b10f3cb7f76b3103ba", + "sha256": "1pp2c0gkh3viwmm6js0hma0v4jcqym444rg42asbiy4rjzr1d5f1", + "fetcher": "github", + "repo": "clsty/evil-tutor-sc", + "unstable": { + "version": [ + 20230705, + 656 + ], + "deps": [ + "evil", + "evil-tutor" + ], + "commit": "1a1bc93eeb432159591b6dbe6684068311c89a46", + "sha256": "1l0lcxjf5fn3r9xwcjnql95fbqx23a4d6a3wnyrw3jzm3hiyckgk" + }, + "stable": { + "version": [ + 2, + 1 + ], + "deps": [ + "evil", + "evil-tutor" + ], + "commit": "9a4a58d4d98c1118383df6ebd352413b95c68457", + "sha256": "1b0pv11793kmrcbb3gj52qnsrcak2dxwxfkqpj3sjss8zpd68bdj" + } + }, + { "ename": "evil-vimish-fold", "commit": "fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b", "sha256": "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6", @@ -35494,22 +35810,25 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20220826, - 1535 + 20230804, + 645 ], "deps": [ "cl-lib" ], - "commit": "dff9ce3577bf3f2938d9bde8ec8aa4fef3b061f3", - "sha256": "18260wml2x3di3nqcsvbi5ic1vzni4amrjjldq8f38nhkkk4p7vh" + "commit": "03fc0a38af9e396c98f5a30c392cf757b3a34feb", + "sha256": "1wmr1z603wmcv8hxzxn84qxzdwmzmdm8x6f3n0x7klviq4jw6v2x" }, "stable": { "version": [ - 1, - 12 + 2, + 1 ], - "commit": "76cd6e3fa8a7dac937af7e40507843dfae4f9184", - "sha256": "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p" + "deps": [ + "cl-lib" + ], + "commit": "03fc0a38af9e396c98f5a30c392cf757b3a34feb", + "sha256": "1wmr1z603wmcv8hxzxn84qxzdwmzmdm8x6f3n0x7klviq4jw6v2x" } }, { @@ -35821,16 +36140,16 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20221019, - 1320 + 20230730, + 445 ], "deps": [ "f", "s", "transient" ], - "commit": "e0a8c2b81f3d53885ed753b911b3cb6ee9229bec", - "sha256": "1wwhb42q86730wn08iyv4538xhvjq62jpm79bxpr1dcanc9w0wab" + "commit": "e008c89e01e5680473278c7e7bab42842e294e4d", + "sha256": "17r5r01br7k3nxy7vchhk94dz0zyrdlg66ip5wlj1kh89xwprvsq" } }, { @@ -36123,15 +36442,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20230116, - 1032 + 20230704, + 1346 ], "deps": [ "dash", "s" ], - "commit": "8a70ba3002197e3c6421181492b60b37d4d4af7b", - "sha256": "1lg0mkcvr4x399m2cp8ryzwv9vqwv0bgkc59af43xz6ry26mpgbh" + "commit": "19e1da061e759b05e8c480b426287a063ca39484", + "sha256": "1ljamkq8hz35gbnh5hb9f7vsavn2g3m8d4qnshlbkwj5hscm72ir" }, "stable": { "version": [ @@ -36333,11 +36652,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20230601, - 204 + 20230718, + 2326 ], - "commit": "5104912ed98f803f2504a8d5cacc341a76bc29cf", - "sha256": "01rq4wff87fza6cd0sccv9ihwa0bd56kcawy0rwfa8jxfq7j84yq" + "commit": "a200d2ac5d7aa7ad04dfcf255d199415e7105702", + "sha256": "0rabjf8pplhwbzmgg7pgxp0mbh47irrv08zy1l8sz6xgmhbc2qip" } }, { @@ -36428,14 +36747,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20221117, - 1821 + 20230619, + 1600 ], "deps": [ "s" ], - "commit": "7181af0d848226ecdb9f517d8e4cf219d00f9000", - "sha256": "15i0j6r9wvzs96zys842akzdklrz2yrblc8zm5pcfs6rb56nnk7i" + "commit": "72f6a7d038507203bbc1cd2d4e4b8cf00efeb3ed", + "sha256": "027sv4k12iclir3phxl0j1jwjv0hhpkxjwvrjmw382p6mr61zymk" } }, { @@ -36622,8 +36941,8 @@ "repo": "jumper047/fb2-reader", "unstable": { "version": [ - 20230305, - 2309 + 20230805, + 29 ], "deps": [ "async", @@ -36632,8 +36951,8 @@ "s", "visual-fill-column" ], - "commit": "9836db284749e0cef4c43c2cb5358c82ae9b8589", - "sha256": "0vx4b9wnmx1bng8wak5r7yryyvgib4m46l6b877xzkdhsjr3rbsi" + "commit": "85777f99483b84f02c1abd6fe0ddbbac7f1258af", + "sha256": "0f93s1wssq40z6328klk47zniv2y0x9899xx2wz6z76fxpxssjk5" } }, { @@ -36828,20 +37147,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20230608, - 1841 - ], - "commit": "dcbd6b0d3fca49dc93cf03daf09585477f573fb2", - "sha256": "1c6d0308rfcj4w9yllwrirdfjkvdpg5ffg31f1syy38jzfic4q2d" - }, - "stable": { - "version": [ - 0, - 4, - 1 + 20230715, + 1855 ], - "commit": "54ed0792d0ac43a2d5db39741cf070c627368419", - "sha256": "0dwas3ivhxdyw6njkcadc8c17cirq325cmby04qls8zkmrvlil1w" + "commit": "8f721285e12382b72c2f7a769d21fd332461eb2a", + "sha256": "12yhlmc8hi7ly3qzgn8iarvhla7gaciywyxfmz5f8pm69mcgiibf" } }, { @@ -37367,8 +37677,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20230225, - 1326 + 20230730, + 834 ], "deps": [ "async", @@ -37379,8 +37689,8 @@ "s", "transient" ], - "commit": "c8143ff6d32d13f809688800e761250b113d1b0f", - "sha256": "05gwxb8w1d2kwp9yd7pcr7pqzmbal0yhkiwxqqf28m9j2vrcyn3n" + "commit": "b19bc85657c3d0d12a7f828b668cda23f1524fdb", + "sha256": "18rlb9wi1q0df89pvpl1xqzlgl8y0i13jjiamd83b27yz0f4zf8z" }, "stable": { "version": [ @@ -37810,11 +38120,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20221204, - 939 + 20230721, + 538 ], - "commit": "553167d27725d078f5c66ed7a31ca8ec9376dfd0", - "sha256": "1d7ffaa90r9n89xx79f0mkmg40p96f415n1lg603vfy6dls1dfmb" + "commit": "9c9ae6f34aa8fca537cdd8a899b337ba8302fb9d", + "sha256": "0nbb1dal3m1s3ryizkwvk3ck0axq62ngcwvrkjp3zx8nk3486jm5" } }, { @@ -37924,27 +38234,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20230523, - 1546 + 20230805, + 1653 ], "deps": [ "buffer-manage", "dash" ], - "commit": "86827e5d2fe6e7757c346db718d97a50acdacb00", - "sha256": "1xgmppl39mnh80vvgxwwlzrgv5lxrmy3rp3xqiyhmg3czwrhsr0z" + "commit": "58890e08800059550565a20dc7029e8bcccc55de", + "sha256": "1q5604da9b9gmg1ci5931fzwrqzkc5n5f02mcfvdk7vfhsakdlaj" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "buffer-manage", "dash" ], - "commit": "86827e5d2fe6e7757c346db718d97a50acdacb00", - "sha256": "1xgmppl39mnh80vvgxwwlzrgv5lxrmy3rp3xqiyhmg3czwrhsr0z" + "commit": "58890e08800059550565a20dc7029e8bcccc55de", + "sha256": "1q5604da9b9gmg1ci5931fzwrqzkc5n5f02mcfvdk7vfhsakdlaj" } }, { @@ -38412,6 +38722,25 @@ } }, { + "ename": "flycheck-buf-lint", + "commit": "f9710e3af6b67cf4e8c41a5b24e6926a92209bb4", + "sha256": "0kiwnish9psc4z2y4yg3f16bj0cdc0ky3fx6kpjif7q4c4j6f5g1", + "fetcher": "github", + "repo": "shuxiao9058/flycheck-buf-lint", + "unstable": { + "version": [ + 20230724, + 1501 + ], + "deps": [ + "flycheck", + "s" + ], + "commit": "51c439dcb9fa40966256d8cce835f7b7aabf44d0", + "sha256": "1gq8abj5ld2hqhwc0p7qmf8vfy8nj3pfzzdba2yh8zx8l22r2h3i" + } + }, + { "ename": "flycheck-cask", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f", @@ -39029,15 +39358,15 @@ "repo": "intramurz/flycheck-eglot", "unstable": { "version": [ - 20230202, - 1844 + 20230630, + 1803 ], "deps": [ "eglot", "flycheck" ], - "commit": "31905ad676d67fb2967a3b6d907312380696615f", - "sha256": "1zkwb0w5rp0b53r4plvckwild717crv51ymfmhcdqdrjlv9qpzca" + "commit": "9ff8d0068be59b1450964b390349d75a68af21ed", + "sha256": "1ab4vp8qyhmg0ckr2h0bw1nm3lwh8zwckgjvzmr3lwcv6drcq67h" } }, { @@ -39413,8 +39742,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20221111, - 59 + 20230706, + 1439 ], "deps": [ "dash", @@ -39423,8 +39752,8 @@ "let-alist", "seq" ], - "commit": "50425a8b96fea84ea15940a4a07b184e43bb8e7a", - "sha256": "088w5f8zw01lr4h6dzdnl36hg5ijln9mknwp7ydvl1scw6v4clf0" + "commit": "b7c4861aa754220b7d0cfc05aa0895bb35665683", + "sha256": "0fmmzwnrrki8bw6nsspcsgzkcxmsrgfkm2200nqgk27fqppjgpgw" }, "stable": { "version": [ @@ -39480,26 +39809,26 @@ "repo": "DamienCassou/flycheck-hledger", "unstable": { "version": [ - 20220715, - 1115 + 20230710, + 1920 ], "deps": [ "flycheck" ], - "commit": "c360025b8433abc4da89b0bfcc7ed1ff27004c64", - "sha256": "1q5fggyshzm6r3cg2wdrj5zx2jskx2dn0kdwdwmw6k0vvx0anxh4" + "commit": "9b7ccd3d49765dd68885d1fa0fb48823ea11fb2e", + "sha256": "0clgbliwiwllnsxf5j7p3smlf487lrgy2a1rdgmjij3qa55wbl99" }, "stable": { "version": [ + 1, 0, - 3, 0 ], "deps": [ "flycheck" ], - "commit": "9e45dd3f6b6cf51acf7312939aa437ae156be2e7", - "sha256": "0q6b0vyd55x71kv4k7jp8xzgy5zf9md8mgy3y6pwmpga9dmv149j" + "commit": "87ed9d4ce448f84f10a5348d8d89d9467ee720ff", + "sha256": "1viwyphz1pz6hhr3g2w96pza3b6vkyd2izz4jr5q6787i1n0yb8d" } }, { @@ -41196,20 +41525,20 @@ "repo": "ROCKTAKEY/flymake-elisp-config", "unstable": { "version": [ - 20221110, - 1626 + 20230711, + 1833 ], - "commit": "e946d9a761a8427dfdd0ae634bcfce4d56111947", - "sha256": "1caclvx5k4x7pdd3pzm2kr1vkncwjgq9w15hbhr16y3sr2g8lh7k" + "commit": "3607b1ee738141f67ae803b4daadd4e2906ff324", + "sha256": "1lzpl2x9rlvz1ribdk4178v0s7mjzfb9zlla7xgsy0w3d9l59gdl" }, "stable": { "version": [ + 1, 0, - 4, 0 ], - "commit": "1d6a7d82a89e265f22e0851f3c1d2e78ef74ce0d", - "sha256": "14a62l6c7ni5i4wnn18x0wswc0xvyf0lc6mcavdad8v3c9rip66l" + "commit": "a2d211fb7ae419186e42c4510c7477f8f2893b5f", + "sha256": "03lmjjxiqbckjkk6zfqzxj113mwj1wx0ld3p8s364svwfaghjg62" } }, { @@ -41461,6 +41790,30 @@ } }, { + "ename": "flymake-hledger", + "commit": "e2d03d329c06a704100efd128f56a496c8a8b35c", + "sha256": "041ydgl8hfvl66599g2xz5k7irhf3sq8dx11734slhi1big59awm", + "fetcher": "github", + "repo": "DamienCassou/flymake-hledger", + "unstable": { + "version": [ + 20230710, + 1945 + ], + "commit": "b42b66186688fbe8dc904d01d9a5378456e011c9", + "sha256": "0dx7zky6nfcajpvkgn2jmdgw9b0k6pjsl7my3vcbanvg0863g9il" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "542f44933712b6e0abd8e4f3e51787a1afb40440", + "sha256": "06v1mm03cl32vij6a3z347dqlbwpv3ag3h56zlfwc4l9g7gvdwzp" + } + }, + { "ename": "flymake-hlint", "commit": "17820f32d46e845cc44b237d0bfd5c2d898721de", "sha256": "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x", @@ -42036,11 +42389,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20230128, - 1739 + 20230620, + 115 ], - "commit": "1567685414c81a24303058631d6ee81fb78eee73", - "sha256": "10lhdxxphjryr8dqqx6njmb0hv3a9bhkfzrajnqfgk1zwhpnvykg" + "deps": [ + "project" + ], + "commit": "7e3f88068b75d797e1efe0fc194f9725469f126e", + "sha256": "01wpp32fgqy1rsgdvmg1zkck7bkh8ciavhswsahv8sx3wpj3gp9v" } }, { @@ -42947,8 +43303,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20230522, - 1054 + 20230723, + 47 ], "deps": [ "closql", @@ -42962,8 +43318,8 @@ "transient", "yaml" ], - "commit": "ec68fcd778f6b3dc6100498aea790457d2fc98f6", - "sha256": "0alb8d435k7mdxl5p3pi4fz51pzkiwlzc6qycc2754236m5flcf6" + "commit": "ecbcce94a5581077f8e1cda3e3f2a66c6dd52766", + "sha256": "1nq6xiq1hsrl0y7md16ddnkr2ycrsdbf2jjqjyaj3ldvdx9zbs6d" }, "stable": { "version": [ @@ -43018,15 +43374,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20230530, - 859 + 20230722, + 1157 ], "deps": [ "inheritenv", "language-id" ], - "commit": "4a5c64e44083de91c5b49cfea71872d503cae8fc", - "sha256": "1pcj1q4w9z6fasc15blspzxzk5jy5q3sdir9r07kxmjqfbj2pv58" + "commit": "2c780df8cf1bb4d464d94f9afe085b5b19036236", + "sha256": "082acmnkgqrd9x9j3kw2z9cmqrm1s35w7hn8hkbk3f239lc1x8xl" }, "stable": { "version": [ @@ -43133,10 +43489,10 @@ }, { "ename": "fortune-cookie", - "commit": "ab0d56626c9bf847c693b4d9ddb08acee636054f", - "sha256": "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78", + "commit": "46eaa313cec21a4b35fcb421bbd7958c96b8df37", + "sha256": "1gp078566h6ivxja8g8v6x2igwp59snr28znqyppv722264w7rnf", "fetcher": "github", - "repo": "andschwa/fortune-cookie", + "repo": "andyleejordan/fortune-cookie", "unstable": { "version": [ 20181223, @@ -43163,14 +43519,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20230515, - 534 + 20230714, + 609 ], "deps": [ "seq" ], - "commit": "e38fb7f13947aa9c61a109b25656176915c85b8e", - "sha256": "1sp65rs4lp5m2kgchlci9xbvr93h9ainb7q5ghsxxnnlfms16ki3" + "commit": "86e5c479c40a6c53b7032868946bbca4dbc561bb", + "sha256": "13vi5wkd8k48vsh4iakw6jcwpjrzlh68qdjy5dpga9bza9r0509m" }, "stable": { "version": [ @@ -43644,11 +44000,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20230409, - 1041 + 20230805, + 1731 ], - "commit": "dfba4a1ca94b5f1d29659c3f786647dcdc315672", - "sha256": "1gfr8mrgsyqi010fldg30lwb6wkpr1x8ashbqmshdp1m5fyza2jr" + "commit": "0ff73440dcaced28cf35e5e542c8936702395185", + "sha256": "0qnxsggq14fs06f70sm9b5wv799hqnqqp769b5rvv950qck0hfhq" } }, { @@ -43767,11 +44123,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20230219, - 1511 + 20230622, + 1854 ], - "commit": "09fec6c91f9c18173f145e28c55d6f21be678231", - "sha256": "0p1y1y3g9qxkgn38fd34wkjkxplg3aphdqgisx556maig69ki789" + "commit": "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd", + "sha256": "1rhyc7yhpi4bjzq5f6bm3v4ab16prl6fvp9kjif6lq6ihh8xb520" }, "stable": { "version": [ @@ -43986,14 +44342,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20221010, - 2026 + 20230714, + 53 ], "deps": [ "flx" ], - "commit": "0fbfcbace0729dba685da9b9a74566639b840ec3", - "sha256": "0vk9nhsvw6v1hm67bihri61x5aja3hbrlawsfcb1s2h1lx36byh9" + "commit": "9cd9fef9c0b319f7e33f687760cc6efe7e11faba", + "sha256": "1hiisd255ivrszfwsjpd827pzqq4sq50qc99fnhvd4p270x4w9vq" }, "stable": { "version": [ @@ -44259,19 +44615,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20230413, - 1331 + 20230721, + 656 ], - "commit": "246c0bea5764e5d9d5607a1f76b4602109e66ba9", - "sha256": "0lmvblx5lwxlsxp6nnp7b64wsdlzf83pv49dx8316wakaid1f5yl" + "commit": "ac2d1ef9695e395b4410ef342bbfb75d7852c798", + "sha256": "0wmmbz7scd0r1bahlvh9av3lwykni32sgyhcqyzd1w867hc77sv5" }, "stable": { "version": [ 6, - 11 + 12 ], - "commit": "2bc1ae508b2e5c0ac377b012ca41eb6be73f9705", - "sha256": "0n1xqsk7086b6dx43djy1aliriidfksafh77f7ng4596sxnphrxz" + "commit": "ac2d1ef9695e395b4410ef342bbfb75d7852c798", + "sha256": "0wmmbz7scd0r1bahlvh9av3lwykni32sgyhcqyzd1w867hc77sv5" } }, { @@ -44297,11 +44653,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20230609, - 506 + 20230802, + 108 ], - "commit": "4da309e209370d5bcbeadab79f509de50a5db240", - "sha256": "1g3qs223g7rprvmszymkbxrkmyg8520h0n9dcv7z5pizdgy9sq07" + "commit": "643f8a26ea1fe6aa3390c95e257718ed6b0b2149", + "sha256": "1yrdgm72wii9i9sa6hdmg7im0yg0jagyf9jg5x56csiz3dh81ywz" } }, { @@ -44467,26 +44823,25 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20230503, - 1044 + 20230719, + 2251 ], "deps": [ "project" ], - "commit": "83305e6bb5f13d68f8e31d457605b02d2a10c014", - "sha256": "1jbgm08f0kzv9sqdar4pa8h51k9l9q9z2140ysn2gqrwc2bvm2fc" + "commit": "761c65be5763a0cac161f2d9ea9dec510f58b83d", + "sha256": "1xzh5wfdgjq5ajd3siq07byy1a0hp7vmlv3qy06f87jk6k97plww" }, "stable": { "version": [ 0, - 28, - 2 + 29 ], "deps": [ "project" ], - "commit": "bfc9cce54b7ac1cb036911965198b5cbe2f43f4c", - "sha256": "01sif1pw3shhdzcg9vidc2j5cqmrgjh5kynicf5mh3kmlvvsg9k6" + "commit": "761c65be5763a0cac161f2d9ea9dec510f58b83d", + "sha256": "1xzh5wfdgjq5ajd3siq07byy1a0hp7vmlv3qy06f87jk6k97plww" } }, { @@ -44497,14 +44852,14 @@ "repo": "emacs-geiser/chez", "unstable": { "version": [ - 20230228, - 2253 + 20230707, + 1334 ], "deps": [ "geiser" ], - "commit": "04ab4387fed68659f21377dbe74513edac2fd134", - "sha256": "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca" + "commit": "605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d", + "sha256": "0rny2wj90fdq5mar8cf3pcw1spld9s8nzlqrl3g0ivfrpgw6ar49" }, "stable": { "version": [ @@ -44753,31 +45108,31 @@ }, { "ename": "geiser-stklos", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "1msv27dfasy18mdjh5ymgqakgjj73gw77nzarcg0s34dbdssrzp0", + "commit": "f3391d87686c8c105de16d7559cfd24f048b8b6d", + "sha256": "0ln3xddz1lxnhbswviwg1b1lpxyp6c8sw17q35i1r917ykby4yhm", "fetcher": "gitlab", "repo": "emacs-geiser/stklos", "unstable": { "version": [ - 20230504, - 1639 + 20230707, + 237 ], "deps": [ "geiser" ], - "commit": "6ae96bfb96f47a75eb882d0d1dac938e4992e952", - "sha256": "1m3ij4r5916lsf810a1shry2v0glnk906r54lxwalaghvz5j3gx3" + "commit": "3358d0cc01436bd8f71a500175db2716e75b2eed", + "sha256": "1zwaw482d3yhlsd7zi0whvaj5a11r1mfir9k54xr504ihxzqlcyi" }, "stable": { "version": [ 1, - 6 + 8 ], "deps": [ "geiser" ], - "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", - "sha256": "1dyzpr9i5pxi2p2hg3ndryh7x4y0r9bra88pd1l904vdfsxdxv5z" + "commit": "3358d0cc01436bd8f71a500175db2716e75b2eed", + "sha256": "1zwaw482d3yhlsd7zi0whvaj5a11r1mfir9k54xr504ihxzqlcyi" } }, { @@ -45335,11 +45690,11 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20220714, - 1300 + 20230728, + 1144 ], - "commit": "adec408e6adab2e8e057fe0ad828749f473bfb83", - "sha256": "0vgslz094hr0xavkjn6lx7hw65i032jiwmxl29bdgi9xrshbv87y" + "commit": "6798656d3d3107d16e30cc26bc3928b00e50c1ca", + "sha256": "03nhqk52wa74dpy31jxlj24cc4ym251v08cdv0zsdnmj7fl3jp2d" }, "stable": { "version": [ @@ -45478,11 +45833,11 @@ "repo": "wavexx/git-assembler-mode.el", "unstable": { "version": [ - 20221205, - 1014 + 20230611, + 1425 ], - "commit": "e88d69d1fd93f166d8b31e02790a1d241fea44aa", - "sha256": "1lvhgs57848jiqsv4nhr3y65jh2zx8fwjh301v7cc162l66bny56" + "commit": "391f507269f4f243d81ebdc1f5d43388dc54bc2f", + "sha256": "1j3911q0zdsk5kfdyaxck2hklly5s8vsnj4mwc4qa9ynbg0iyalg" } }, { @@ -45638,16 +45993,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230521, - 2344 + 20230731, + 908 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "d81db78a0611d21048c1e2ff069a83f964092f10", - "sha256": "0y5zhyfrxrxzc6x11bifwnky2m652sr4q7909b8ggf8rkf0f7nva" + "commit": "9e95c2381375cb064d54a6afe70d61140da6fa30", + "sha256": "1cyinp10lrgc3f68k55dxaaf3xj1pr28yflr2y2f6wms93yka2gs" }, "stable": { "version": [ @@ -46072,25 +46427,25 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20230413, - 620 + 20230630, + 1214 ], "deps": [ "transient" ], - "commit": "13769fb603ae88c64566529eae4525ce88026e86", - "sha256": "0d1aj9xhcyksg115xl2yw0rd62hp53ig06y54jvii1l8vavb94jy" + "commit": "ac933e5cd29583c131401f3bd991d98129c316df", + "sha256": "152vq34dn76m21ab97wwm31hgp2wl9y437vwmd4kcd5pvwjhx9c6" }, "stable": { "version": [ 4, - 11 + 13 ], "deps": [ "transient" ], - "commit": "391eb61050de321101e631fcf373fc70ec6e7700", - "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x" + "commit": "ac933e5cd29583c131401f3bd991d98129c316df", + "sha256": "152vq34dn76m21ab97wwm31hgp2wl9y437vwmd4kcd5pvwjhx9c6" } }, { @@ -47620,11 +47975,11 @@ "repo": "s-kostyaev/go-gen-test", "unstable": { "version": [ - 20230127, - 1422 + 20230616, + 2053 ], - "commit": "f84f4177af7fcbe10ce2116d5417ad5f0485034b", - "sha256": "1bxa3870vr2hyaj4isvhzfhhs56qyrp9lngapsggxhdq1r9vwqra" + "commit": "af00a9abbaba2068502327ecdef574fd894a884b", + "sha256": "0q81zkyrl1njwxq29rx7gq9m9w3jags6akxzl7jd9yrnl4k2l27p" } }, { @@ -47753,11 +48108,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20221228, - 1706 + 20230624, + 2315 ], - "commit": "166dfb1e090233c4609a50c2ec9f57f113c1da72", - "sha256": "0vahf3gbdw8b7k28zicm1xi686b2lrzdx8nkzhwk9z25brw86jj8" + "commit": "f21347ae9cf68ea33031bf5125896e8f16c8183c", + "sha256": "17shrclbv0agz579wgsc49rlypx02x1w4zyikijdb4fz0lzq8skr" }, "stable": { "version": [ @@ -48599,7 +48954,7 @@ "version": [ 0, 30, - 4 + 7 ], "deps": [ "dash", @@ -48607,8 +48962,8 @@ "magit-popup", "s" ], - "commit": "4561966a62f6f89bbe4e3d173a73f684852a37a1", - "sha256": "14x83sh5rwff9302dih0sjahp2mji2jk776sabrwdrqqddkv524m" + "commit": "46fd9d2d9b51098101affd161167d6bd93b78dee", + "sha256": "1jfhdnd9fq44lb0p5269hgbf6fvf2qq3kw128fblf05rcgvm5h7i" } }, { @@ -48651,6 +49006,21 @@ } }, { + "ename": "gpr-ts-mode", + "commit": "a4c0d894020259d0f6829ca8e416570104c3a732", + "sha256": "1dr6mgqz53akm07nigpb99yns2s7d2z0zn0a7gng47p8s9ph2y5p", + "fetcher": "github", + "repo": "brownts/gpr-ts-mode", + "unstable": { + "version": [ + 20230719, + 1141 + ], + "commit": "2fac9f29e446c202566e0cc83042de33758aad17", + "sha256": "1w54vckl4axjr599rm8q7slkjyrrfrfgnqc0s4yczh3fh95l9i9g" + } + }, + { "ename": "gpr-yasnippets", "commit": "479f099c620b584723136c1c6a4f2e4c7370203e", "sha256": "0nw1gchk94lqlhmbhc564yvai2vwiw2165az986lcwsn27sp446h", @@ -48684,6 +49054,38 @@ } }, { + "ename": "gpt-commit", + "commit": "f185ad72c83870fed6517db9e74d426766771fb4", + "sha256": "0zw4g9sbwrc0rr0ck77zxdglzdl11y6yq6pphc3jhxnsyshj21qz", + "fetcher": "github", + "repo": "ywkim/gpt-commit", + "unstable": { + "version": [ + 20230716, + 331 + ], + "deps": [ + "magit", + "request" + ], + "commit": "8a8883be2051eed499c5bc3035a75ff56d64d5ff", + "sha256": "0dbjf644wcah5nzv8jj5akb4y74w2z0417gqiqcm8gdgg9s04iz7" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "magit", + "request" + ], + "commit": "e3bdc836c7f423622e5c7984735a7dab2c2f342b", + "sha256": "1rd5crbmcp5dg3jyka7i3cs60752jaar31dp7d3ridsgywmbiqmv" + } + }, + { "ename": "gptai", "commit": "24a96bdf7802aacded56d84e8824d9394335a309", "sha256": "15m3nxlgzw0was6c3f3wmq6zw98fx47ga7dlxsb5wl3pnpr8nxnc", @@ -48715,26 +49117,26 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20230606, - 423 + 20230806, + 41 ], "deps": [ "transient" ], - "commit": "20af9a8b99c57bc22b8af1e0baa8784b0b521813", - "sha256": "0vhjy1xs1f7rm62gwf77i8sxas5sz2x3714jr6d291dyb7k6kgl9" + "commit": "c0ffce0849c8596d763d0ad603b9d67f75e93161", + "sha256": "11i5w3fb5x231xg4swmkgr022805rs8q3lv54g42111hv4a1d3xr" }, "stable": { "version": [ 0, - 3, - 6 + 4, + 0 ], "deps": [ "transient" ], - "commit": "219e163dc76d3cb27d8438816a453ccb686c553b", - "sha256": "1ykqq763sm0km167vyqxcg3jq4g1dzrvn9zwm9q927v83ijh6pf9" + "commit": "0f161a466b880cde864d8aa709ec04e1a86f445a", + "sha256": "1aac0jds8hzyfvav06mhqm32v81swrnvyv0ldrkd7qxc2b1x4q7n" } }, { @@ -49783,22 +50185,6 @@ ], "commit": "a85f070c18b915ec50f12cf5375b7a32830d66f9", "sha256": "0m9fsvzvyj3pibmxpknfkmp06knyi9zr4avmjjnhinqxa1g7cm7h" - }, - "stable": { - "version": [ - 0, - 5, - 2 - ], - "deps": [ - "bui", - "dash", - "edit-indirect", - "geiser", - "magit-popup" - ], - "commit": "c2796e68868c91253b6aca422a9ae07363aa03a9", - "sha256": "0i0bvv3wd3fd22mffa62076mi1cnzwyphibqiimll23kngg507b2" } }, { @@ -50048,6 +50434,21 @@ } }, { + "ename": "haki-theme", + "commit": "64a51bb9463da89c974b1dfaec56f62138d2f78d", + "sha256": "0w8pfsya5xhw2m8fq7443pwwrmgmji448ygm976bidfa96hmy5gg", + "fetcher": "github", + "repo": "idlip/haki", + "unstable": { + "version": [ + 20230802, + 729 + ], + "commit": "522948af6b7d562d70e366dfce152464f058b8ea", + "sha256": "0wyqagjlqnd8r40k33s5h5lm3fclgaaws48crigprf6rs307hqvm" + } + }, + { "ename": "hal-mode", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", "sha256": "0nlan5f3llhn04p86a6l47dl9g83a51wzrchs2q8rvfcy4161nn4", @@ -50191,14 +50592,14 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20230516, - 505 + 20230702, + 342 ], "deps": [ "ts" ], - "commit": "5469d2d6f6f7ccb521ea0e3ada9b6531ac2e1a70", - "sha256": "0sqmvd177jvrj4js1jvccb1i3nvbcdiwfdkpd40gshqb6y6nj0fy" + "commit": "471958b7269a7901804e3e7be20e14d69fc7b11d", + "sha256": "08r0m6ldcmvc9j9jd30czkabhvkwx6xp56zyhzg2bfxna3c61yfi" }, "stable": { "version": [ @@ -50476,19 +50877,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20230511, - 1509 + 20230806, + 1107 ], - "commit": "98d0e193a6157a810330e83e46717a37d5a4d236", - "sha256": "1zk6g5v8m194v8pyfcmafa7z2ipgid69aiah07d8sd330p54m0vg" + "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", + "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" }, "stable": { "version": [ 17, - 2 + 3 ], - "commit": "e72677668f5fc7cc148008e885a0f256e245dd43", - "sha256": "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5" + "commit": "6695ab8c601eae863b415dc3cc81d576471e3ce6", + "sha256": "0q7rqksxj0imp5mj3pb8api47fsrmcrh9graqkqg2mh9fvlprykq" } }, { @@ -50803,28 +51204,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230610, - 741 + 20230806, + 1431 ], "deps": [ "helm-core", - "popup" + "popup", + "wfnames" ], - "commit": "c04b867ab5d0bb6d0ad52e52c7a5319e25da6358", - "sha256": "0v6paisxmw9312jkq5nj4brc4snfynwvhdgj453n1y0pmccnvrmv" + "commit": "663e98024c4ec322766010183901b2a4067fac68", + "sha256": "1a9785x2zw87zar2ywj7l7p9xc67n0bdz3vmi0325aqz4swbmfym" }, "stable": { "version": [ 3, 9, - 0 + 3 ], "deps": [ "helm-core", - "popup" + "popup", + "wfnames" ], - "commit": "371df21b1e73be03b90028e2f5d8554f70a989b7", - "sha256": "1i253ani2bl665biha0f071pncr2jh7x5yxp8rg2013sdf4nr74c" + "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", + "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" } }, { @@ -51676,26 +52079,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230606, - 612 + 20230806, + 517 ], "deps": [ "async" ], - "commit": "b32374c65b1d2a9b26307b8f12fd5886329f6271", - "sha256": "0f993bdb7s5rsk90aj4lrwjkn49nv4xs9d6hiaixmjw8nw4zksnj" + "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", + "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" }, "stable": { "version": [ 3, 9, - 0 + 3 ], "deps": [ "async" ], - "commit": "371df21b1e73be03b90028e2f5d8554f70a989b7", - "sha256": "1i253ani2bl665biha0f071pncr2jh7x5yxp8rg2013sdf4nr74c" + "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", + "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" } }, { @@ -53279,14 +53682,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20230505, - 1437 + 20230621, + 1538 ], "deps": [ "helm" ], - "commit": "771b9add5259613a4b402a5972574d24dd121d7c", - "sha256": "05dbz06xp3za434xhj8glhaawww2pjh6fkm6wmbjl92pa4bcg9bn" + "commit": "78418a73ca7e796bc95da47a0f3d6bfa0af382b5", + "sha256": "1giwvi1ds7s9ljymjmk36r10cxa1jc2gbssl67m0bqmpsi3vzxmq" }, "stable": { "version": [ @@ -54078,6 +54481,24 @@ } }, { + "ename": "helm-project", + "commit": "c49facfa0729e85385f77cfff1e21e5527c6c842", + "sha256": "095b665kxijv9miqg7gm3bvijk6csi8v8a5jkh31sbnn06ifh1ww", + "fetcher": "github", + "repo": "cmccloud/helm-project", + "unstable": { + "version": [ + 20230608, + 1212 + ], + "deps": [ + "helm" + ], + "commit": "1e0cd563b2470ab7dbfc47a8cbe7dafd030dce70", + "sha256": "0glv3rp693qim2jaapj1bsb7874vyb6pf82kd2bd4hk02n4g0dwd" + } + }, + { "ename": "helm-project-persist", "commit": "98780edaf8b1d97aec9e25d07d93289c90fd5069", "sha256": "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld", @@ -55135,26 +55556,26 @@ "repo": "masasam/emacs-helm-tramp", "unstable": { "version": [ - 20221228, - 1444 + 20230714, + 1053 ], "deps": [ "helm" ], - "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", - "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" + "commit": "6683eae65a106d5afd5575b2b05cdb5529ddc926", + "sha256": "1cg9hawb3c6c6h8yfnnf0jamhv82y9xdcqpca497k8b24rcfmmfq" }, "stable": { "version": [ 1, 3, - 10 + 11 ], "deps": [ "helm" ], - "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", - "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" + "commit": "6683eae65a106d5afd5575b2b05cdb5529ddc926", + "sha256": "1cg9hawb3c6c6h8yfnnf0jamhv82y9xdcqpca497k8b24rcfmmfq" } }, { @@ -55495,8 +55916,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20230504, - 1546 + 20230730, + 1732 ], "deps": [ "dash", @@ -55504,13 +55925,13 @@ "f", "s" ], - "commit": "32cb28b50b3366ad35e2cb936367268ddeec745f", - "sha256": "0lzja7piryk4lh51nv50fmiw9axzp2wp4k9b3ajygcmsrqqwqp32" + "commit": "6f8991a72c83d904725a9d6c00de2cabbef32de9", + "sha256": "14f1bdcpd8jq912d0rsyj9ajxf8p98rgyc7msx1c24wrknaspjh0" }, "stable": { "version": [ 0, - 19 + 21 ], "deps": [ "dash", @@ -55518,8 +55939,8 @@ "f", "s" ], - "commit": "2afbde902742b1aa64daa31a635ba564f14b35ae", - "sha256": "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a" + "commit": "ced07fe0d48ce1111d7a8376fdbfef34d927c967", + "sha256": "03afgdbs5nmhw833svrqky7fmfs1zlvqzcj7j5g29sakivs60xqc" } }, { @@ -55583,6 +56004,42 @@ } }, { + "ename": "heroku", + "commit": "4557abb24fe220fdc8230718f6754b0473e2741e", + "sha256": "0agnif8zlhfhprxgn09ibz3bhmccn4f2pzma378n7phh5f36f4zg", + "fetcher": "github", + "repo": "licht1stein/heroku.el", + "unstable": { + "version": [ + 20230704, + 1217 + ], + "deps": [ + "dash", + "s", + "transient", + "ts" + ], + "commit": "22b2b8442de444011fb2306f6a50bbe898cd1fc3", + "sha256": "0cv0jabbhl49dfks718bcl5hjq6niamyrsarlq87hqbw6603i5qb" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash", + "s", + "transient", + "ts" + ], + "commit": "22b2b8442de444011fb2306f6a50bbe898cd1fc3", + "sha256": "0cv0jabbhl49dfks718bcl5hjq6niamyrsarlq87hqbw6603i5qb" + } + }, + { "ename": "heroku-theme", "commit": "348f0e7aec86c3efd87ab06849a5f1ce90ba23e2", "sha256": "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9", @@ -56228,11 +56685,11 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20230531, - 1417 + 20230711, + 925 ], - "commit": "d1694b760508bc2c3c50945e837b92959c34df31", - "sha256": "064l6jcw024kw1v524ndlsn4ah5xa18lvmwylii1qrzsdrd8ghwh" + "commit": "087c66964182221250c746f65584f332c97a4c86", + "sha256": "1990s0risfhvg30hh9xg75nyl9qd15j0dkn0gf77lsh5fnmhlymh" }, "stable": { "version": [ @@ -56336,6 +56793,21 @@ } }, { + "ename": "hippo-themes", + "commit": "dd67997eda007e568210deca7252a1d1eb93a83b", + "sha256": "1jk4cgjjxfzndx20v8dcc8qarvy9a2kinjgk0z8hnacmjcmzcqhz", + "fetcher": "github", + "repo": "kimim/emacs-hippo-theme", + "unstable": { + "version": [ + 20230626, + 1439 + ], + "commit": "ab04264f651807fd41617bca0216c2b2e6cdb79f", + "sha256": "1ligj4frj4zl490byyzbxqrpwqjak45vgzgs5rl8p731m7rksg2v" + } + }, + { "ename": "historian", "commit": "f16dacf64c52767c0c8aef653ac5d1a7a3bd0883", "sha256": "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab", @@ -56496,11 +56968,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20230521, - 1312 + 20230801, + 344 ], - "commit": "c71bc7ef421a25f27993d695d230b03e340d55f4", - "sha256": "17rwmfd3s00jshkp5g32aji3ndgh4hk4fjz2x8gfmyh8fyckx3m0" + "commit": "7734b40be12ab2ca34038896ec6223ecc82d89b4", + "sha256": "1psg26i8nxb4755dhjvp48j2wh5gm6rj0h1kqs8m6ivm18ns8mm2" } }, { @@ -56511,11 +56983,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20230201, - 140 + 20230709, + 2303 ], - "commit": "a573977f9734b1786a4691c9fb8e5031159027f6", - "sha256": "0wnf62vlpa46nb0ziabn3c95i59x7b0sxjwkmkhmcgzqfa8g86jd" + "commit": "3ac2508a2220138ef97155624cb2f12e74b985a2", + "sha256": "0dm27j3m8ibrylfmmcvksimq6dl6d1xxrrfm6g105vim92rv86fv" } }, { @@ -56578,16 +57050,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20221116, - 2203 + 20230721, + 1812 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "07baa57017e1b7703560363a6e1948b630a5158d", - "sha256": "0ps6w2a060662c36nmjh0z9ln1gccgl9cvgynrw8m5811inxw4km" + "commit": "ae551c0601dc39e0f751fe52a97fab01f4844e0a", + "sha256": "0v8pm91fvnnpx72ihg33dakiw1jwy4w45p7qabxzj7vwjdp7w6yq" } }, { @@ -56974,14 +57446,26 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20230218, - 818 + 20230730, + 534 + ], + "deps": [ + "cl-lib" + ], + "commit": "4b68c83cd2398dabec7c10ea73526659e0d27231", + "sha256": "1mmc2nndwmsicc3lrji99cwl7y4bjp984pbhc2fqsbcn046skdqy" + }, + "stable": { + "version": [ + 1, + 5, + 0 ], "deps": [ "cl-lib" ], - "commit": "ffc1e7da1f02f750094a9f0fe8a0aa837743193b", - "sha256": "1hhphdczwqiwb96d4wi0bxv4cjph4sb4pgb4wjihy2805b0dj9ar" + "commit": "6523a06a8d4fa3e82801d2752e927a972c9084d3", + "sha256": "0g3cvjxkckw0pk8xmccg5gd8hmssdl82m4awarqndp8xqp444fjn" } }, { @@ -57010,14 +57494,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20230214, - 1632 + 20230703, + 558 ], "deps": [ "dash" ], - "commit": "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6", - "sha256": "0nbmdh0ba89hr617kk0ak78blj7birrxi8rpn9ps38a5x41l46a4" + "commit": "1c49aad1c820c86f7ee35bf9fff8429502f60fef", + "sha256": "1vyk81xav1ghdb39fqi99yf6yvzsh6p007v7yhzk1bbqqffkvqdj" }, "stable": { "version": [ @@ -57078,15 +57562,14 @@ "repo": "plexus/html-to-hiccup", "unstable": { "version": [ - 20230120, - 1416 + 20230727, + 1013 ], "deps": [ - "dash", "s" ], - "commit": "12f12fe3165eebbcf17e6209693c8e7251ffa04c", - "sha256": "0k25rd75j37dl19h1w03i1sbjdhwczpw5bb9ynarr6xxfk73iaaj" + "commit": "6879354b8f33ca0c35cf0929581d419cd0ec9ea1", + "sha256": "17yikmrzr2dzlmx1lnb4j81sn557zxjqbd7qsw3v43kp418yf1b2" } }, { @@ -57566,8 +58049,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20230604, - 332 + 20230725, + 2050 ], "deps": [ "compat", @@ -57575,8 +58058,8 @@ "persist", "plz" ], - "commit": "10fd83be43cc901cf03ef7bfa6a7320c48743351", - "sha256": "0wvanx4fvdk5wyvqv6m4095almhs4shrxbk7wjai0i7bz82yy18q" + "commit": "470684f3ef3ac49615691160ee42caaa27ca40ba", + "sha256": "0bnhjnhb1gqk4svn4r3czwzjcaxa4ca202isj2fykzdnxn1xlki0" } }, { @@ -57695,11 +58178,11 @@ "repo": "Stebalien/i3bar.el", "unstable": { "version": [ - 20230514, - 8 + 20230724, + 305 ], - "commit": "6bbad0891d330b119c77c036643bfb5f9d4d25e3", - "sha256": "0id2xhw0wv53iwhgcmvn9aljgwny2nlmvvs0p87c5r45zzl4s1bm" + "commit": "82efd5c87a3b3e9bcb5257c0a678f861f24e477e", + "sha256": "15wqx8jhms9w22v9jdc2c3lshbaqfm0192qmckygjh86iyjqv041" } }, { @@ -57779,20 +58262,20 @@ "repo": "ngraves/ibrowse.el", "unstable": { "version": [ - 20230123, - 737 + 20230720, + 715 ], - "commit": "b42685528d7bb2ca968fbf536d8745838e633828", - "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + "commit": "ed345cf0c4bd617caf8377dcf6472a4ebd68abd8", + "sha256": "043q3p7zlgnf2wiflfx63x8krdm5wxkb6zd9rzrddd6j5j2npzzh" }, "stable": { "version": [ 0, - 1, - 8 + 2, + 0 ], - "commit": "b42685528d7bb2ca968fbf536d8745838e633828", - "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + "commit": "2f82f9db95d45cb541ef22eceb7e16638d88ab36", + "sha256": "04ksiqgfg1xxych2hvqrf8yyrp3w2ah52q4sdf626pj3hp0vh1iv" } }, { @@ -58021,15 +58504,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210630, - 1606 + 20230626, + 2045 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", - "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" + "commit": "fdf2a280f27def4b633a3a74ebdf3a6c95471e3d", + "sha256": "14182x7xzhwkr3n5fp7acl7rfa34nf4j0yqk01jpffmiwnn8vnh3" }, "stable": { "version": [ @@ -58061,17 +58544,17 @@ }, { "ename": "idea-darkula-theme", - "commit": "abf27cce70443010f996b5577d71fe78f7eab6fb", - "sha256": "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk", - "fetcher": "github", + "commit": "71e05553c92d5a92d0e57a7637c86ee16f498241", + "sha256": "07c6f5h2bkfvh1i73hjw11dvb7wzyvmm50jp9q795xv9d21is3ww", + "fetcher": "codeberg", "repo": "fourier/idea-darkula-theme", "unstable": { "version": [ - 20160416, - 2303 + 20230617, + 2005 ], - "commit": "52602d9b91883e1f297d000951aeed48bf60176e", - "sha256": "1hknhbm3b5rsba2s84iwspylhzjsm91zdckz22j9gyrq37wjgyrr" + "commit": "2ba08b6b7c0f75d460d81e1f02114a6449bb1868", + "sha256": "1az5r2x4s2kfxgkc8p4yba6rhbi03zsd7kdkvxfknlf7c3zjl36y" } }, { @@ -58548,15 +59031,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20230210, - 2150 + 20230802, + 854 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "788f53520db8042fb6dbc56779a9439da0dd6693", - "sha256": "00apzc6n80hwf0g64mzq3pm9jbqw3k3i8ffr0hfjdp1c0777cwiy" + "commit": "37c6b819903191acd85c56ef6f7ccf579b57eea4", + "sha256": "1m01n454rsj32w4pvg5y2c9jh88agf81w4x3fmvknjqncx9f1mv8" }, "stable": { "version": [ @@ -58651,6 +59134,38 @@ } }, { + "ename": "igist", + "commit": "fa3a59fbc5e16e6bb85f04fac534864f11a33830", + "sha256": "0sz4n3l0jwpikdv6rxx9slbmn67bcvffhmzk7xq539i0kb7qmrnm", + "fetcher": "github", + "repo": "KarimAziev/igist", + "unstable": { + "version": [ + 20230806, + 1423 + ], + "deps": [ + "ghub", + "transient" + ], + "commit": "87e71a596ae004f0ee3480753a03ab76f9eb927c", + "sha256": "1haq4cibqxbbj0wz51q3fbqsaz7qapjxkdal1d8yc7lmqdpjfd7d" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "ghub", + "transient" + ], + "commit": "b8944d96746c3a77d7a6340b679c69025a6ee840", + "sha256": "0y24i1wjhrn2mvzkbq4a6kqb372mcdvfs36qmwm08lxpwnr3s0fi" + } + }, + { "ename": "ignoramus", "commit": "ac5439afe2f9a902e615f0cf919ef7138559c0f0", "sha256": "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9", @@ -59303,20 +59818,9 @@ "ename": "indent-lint", "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", "sha256": "0q2d5bbbz79krrhg60glxj62j017g3wrac66cjzlkk1zf37x8fll", + "error": "Not in archive", "fetcher": "github", "repo": "conao3/indent-lint.el", - "unstable": { - "version": [ - 20200812, - 949 - ], - "deps": [ - "async", - "async-await" - ], - "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3", - "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc" - }, "stable": { "version": [ 1, @@ -59507,10 +60011,10 @@ "unstable": { "version": [ 20230611, - 324 + 1945 ], - "commit": "d4ace5ac49c2bb07818fd2f40bae1f1a25e95481", - "sha256": "1y0g0zqyccd7w2289m67g8icgy5n9gh2n0rmdhc0z85w4ybr9748" + "commit": "77ac6af83eb4b816c62f58a0298b1bae0c3d69fd", + "sha256": "0vp7x11ggygq1xlzs4zqqy7x0qvyvy7349grczfv78awqzigdhqb" }, "stable": { "version": [ @@ -59792,19 +60296,19 @@ "repo": "purcell/inheritenv", "unstable": { "version": [ - 20210204, - 354 + 20230804, + 651 ], - "commit": "13c0135ddd96519ddeb993ee21163d6e11b4f464", - "sha256": "1zwj26mxc4md4ar79pfdi8i4v2qr9bdrqjb8ykal524gqm79xsb9" + "commit": "00106bb208d06e5f1ec25d0c2f41c000cbb25076", + "sha256": "04na9m3z3k94jjqcqps95xcmvjklnddhli2xaac16m4ackw2wv9b" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "bc680a2670156cd482edba83d8c81142282174ba", - "sha256": "0ygzf70vfb7qwpsllcq5i3brprsnx3sxy2zng02mzwrr5jkx4ypc" + "commit": "00106bb208d06e5f1ec25d0c2f41c000cbb25076", + "sha256": "04na9m3z3k94jjqcqps95xcmvjklnddhli2xaac16m4ackw2wv9b" } }, { @@ -59951,11 +60455,11 @@ "repo": "ideasman42/emacs-theme-inkpot", "unstable": { "version": [ - 20230611, - 243 + 20230618, + 715 ], - "commit": "7eb83235047b3b126e07023b0a897be62f362c74", - "sha256": "051spjm3hpl97ba5xpmdwz9kpqw2747w79mk5bwi2wjfy7p2skc4" + "commit": "2f59c524e17f8fb157bdbae5cf10cfe42f63c6bd", + "sha256": "08lnbvnn56hkm78sxs7k5h8wy4v0c2aynq41bqjr3p2j19hkxssr" } }, { @@ -59990,11 +60494,11 @@ "url": "https://repo.or.cz/inline-docs.git", "unstable": { "version": [ - 20230406, - 1002 + 20230708, + 222 ], - "commit": "8eb1c43b53a7f51cf74cb85529d108b5ce5efff5", - "sha256": "1pk7snxn5wdghslwlk09ycszv7kyv9ilfb60pwg08pfq6sd2w64n" + "commit": "08eb99f65406993425ccf9937aad013436a7c6ef", + "sha256": "1iisz4vsbza658fdj455yambd5njjvid8m8jjmszpf8yi2rgyfd6" } }, { @@ -60392,14 +60896,14 @@ "repo": "emarsden/ipp-el", "unstable": { "version": [ - 20230303, - 1138 + 20230714, + 1021 ], "deps": [ "cl-lib" ], - "commit": "8011ef4f550ebfbeefcacc1196a103580c730cfe", - "sha256": "05l1ryj54h5ylqia3zwncbsdqdklpj7pzvrmarnmfrs722r1s5fg" + "commit": "2b9359ca49acc558fe15622f63e2d31843cdc1f5", + "sha256": "12gywh219l1vqcr691qnjrjam9hj6j7fx9x0vmfykcxwxb9krzm8" }, "stable": { "version": [ @@ -60861,11 +61365,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230410, - 1815 + 20230714, + 751 ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "9d630d800e856a2c984c5a62a6f0ad313a9d2228", + "sha256": "0a2z9ca2m3f3wk4al60psdxnc3lyalh8h2vv6dr5l2xx5ahhb9ja" }, "stable": { "version": [ @@ -61403,25 +61907,6 @@ } }, { - "ename": "ivy-phpunit", - "commit": "93822c5588f81683e3d43f690785b80c207d331d", - "sha256": "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs", - "fetcher": "github", - "repo": "12pt/ivy-phpunit", - "unstable": { - "version": [ - 20180219, - 915 - ], - "deps": [ - "ivy", - "phpunit" - ], - "commit": "ffedb0138d36564e8e36a28fd9bc71ea8944681f", - "sha256": "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi" - } - }, - { "ename": "ivy-posframe", "commit": "9e7c6f7ca439683abf11dcaa38672ac139c0da4f", "sha256": "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b", @@ -61821,15 +62306,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20220713, - 1538 + 20230715, + 456 ], "deps": [ "fsm", "srv" ], - "commit": "af0315e174fa6446d5c4dd3e6465d48912950e58", - "sha256": "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq" + "commit": "c52d60d0a1fd209301c8434634259946c61a5f53", + "sha256": "0hncr3jjipg0hvbspzslyswrr7qyxlln3s15z4f7snsaflmrzsdg" } }, { @@ -62025,15 +62510,15 @@ "repo": "dakrone/emacs-java-imports", "unstable": { "version": [ - 20220712, - 1653 + 20230713, + 2247 ], "deps": [ "pcache", "s" ], - "commit": "bbb173c319a32b46680b5c0bffd72b607ed7b71a", - "sha256": "1wg8g4xf2gc9zalckkn35f49kl8ds2jqxqiiynk18r248axpkxkb" + "commit": "1489813795ecd061896e265720709040bd90d96f", + "sha256": "074d9mf1sq12c8nadlbdf59dkx349ww7nbqbj2h3jp1vql7yzx98" }, "stable": { "version": [ @@ -62138,11 +62623,11 @@ "repo": "donderom/jazz-theme", "unstable": { "version": [ - 20230524, - 1145 + 20230722, + 1307 ], - "commit": "d67e09f320d03ace79a05bd28f967b1ac61f2348", - "sha256": "07m17yqhlc0fc3ga3dhkcrp9h8kr17s00ky3zwr8f2k6chj7xmn2" + "commit": "1905841af1df7b7075dcc8e1e3df4a9b5022f4a8", + "sha256": "08c9yhk00dwiyp73pgjdbyjngsmj8gpfkzb2x2sigsnwzv0hg8zn" } }, { @@ -62579,25 +63064,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20230526, - 1818 + 20230730, + 1200 ], "deps": [ "compat" ], - "commit": "68b4685991e38eaaca645bd469fb331dd07d0ff3", - "sha256": "1x1px0202plwp14h2cb6s1acmc47cvbsamzxlqyhgfakg63b3ckj" + "commit": "416b76abd9c3155797329c2204cf50e535ad566c", + "sha256": "0j49mhy9xhm79b5pi64fl1gzlqcf0vw48kjww0d7xf7g76zq5a3c" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "compat" ], - "commit": "7fced90fdaca5a482cd08b80967e0eac5ee8d885", - "sha256": "1y097rnf9zg26jf4vh74a0laddfp4x6pp1fjqs3xqgwc0cmdq59w" + "commit": "9a10a621c505c65acfb6222240263e29ad546f68", + "sha256": "0xayrqnsws2n2p0qbdl291fva4ljp3kqrr591xbq1wr6n95hfyn5" } }, { @@ -63064,14 +63549,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20230509, - 2244 + 20230628, + 238 ], "deps": [ "cl-lib" ], - "commit": "dd7abb28844f745f7520db87695b7aa579cbe683", - "sha256": "1x7xaw8snbzqv5v1cqsv1g1xhklllshl8li2wl8cg5m39l3ggnc8" + "commit": "79bc78d77db0d2e8e43dc0f9e0504ad90bcbc26d", + "sha256": "1mgqxpsaa5ks9nrsljybw97kcb5rgh1a5si3h98h1firns1vapwp" }, "stable": { "version": [ @@ -63239,20 +63724,20 @@ }, { "ename": "json-mode", - "commit": "03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6", - "sha256": "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70", + "commit": "1016d63d5a3bb14b1e512f6fc6d5bc21fc3ca4ce", + "sha256": "1cnv4xxzpajqgyvx6f4a3133ylfprpq8ifs3pgxw7582yyjnczff", "fetcher": "github", - "repo": "joshwnj/json-mode", + "repo": "json-emacs/json-mode", "unstable": { "version": [ - 20211011, - 630 + 20230805, + 507 ], "deps": [ "json-snatcher" ], - "commit": "eedb4560034f795a7950fa07016bd4347c368873", - "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" + "commit": "481d5d9f4003fc14d116bf31d1bf71d14960d7d9", + "sha256": "0k4sfw3dq1wlfz2hyw72h6wgf1sss8xjcc1bnwwn7ip4balwi1yf" }, "stable": { "version": [ @@ -63329,10 +63814,10 @@ }, { "ename": "json-process-client", - "commit": "a681f977631344190e2a35d9ac2cbb9a42402272", - "sha256": "0nf0lna15ymcn8wniz24ixxwr1qaznic9nym1q16ifwl72qryj79", - "fetcher": "git", - "url": "https://gitea.petton.fr/nico/json-process-client.git", + "commit": "72d6cd0fab9da7d0fee835ce910d520d5214d5f7", + "sha256": "0qk22ma9z7fbvimag8b75m74l4xcgjmjw638g3s344s8nzpbqcms", + "fetcher": "github", + "repo": "DamienCassou/json-process-client", "unstable": { "version": [ 20210525, @@ -63461,11 +63946,20 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20230414, - 1851 + 20230724, + 1446 ], - "commit": "e6a6a8452fc84f77bf5644851306c8b8d63a3bc5", - "sha256": "1ay8ccpgifxlk41ik04b4870vvfyq42cib348wm06rpazwjv07vp" + "commit": "43ab410a017f01bff89f83de3b450da46691e6a2", + "sha256": "062p516gqah2bkwcci7nxb1ccj4rk8rcxxss6h1rqfifmn0i1lgp" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "43ab410a017f01bff89f83de3b450da46691e6a2", + "sha256": "062p516gqah2bkwcci7nxb1ccj4rk8rcxxss6h1rqfifmn0i1lgp" } }, { @@ -63594,11 +64088,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20230510, - 745 + 20230712, + 1524 ], - "commit": "b35e668d6bcf0fb7de4a9ee1a72ae13aa4fb6562", - "sha256": "1m6465q6qi2h2yx7s7a1g6q6n8i40bcksac3s00mka840rm3cp4v" + "commit": "7a8c868e0d3e51ba4a2c621ee22ca9599e0e4bbb", + "sha256": "0xwd4kq69ray6bk8hwjxnqf7myc3mn36chc2l9jn7a0x1f8x6k10" }, "stable": { "version": [ @@ -63665,19 +64159,18 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20230530, - 1319 + 20230804, + 2013 ], "deps": [ "dash", "julia-mode", "popup", "s", - "spinner", - "vterm" + "spinner" ], - "commit": "c33663abf081a06e0fdbf5818255f082070d2160", - "sha256": "07dj788hdfskn2k400q2fcfh18w7gflfrc5zqg8bqflhv755m30k" + "commit": "a88755dcb46380d6df2cf54c8e82d5aa15780768", + "sha256": "0i4f8bixhzvf7zjpyw118qdrg19kl8kh8b3fq9hfsikgjv9fancx" }, "stable": { "version": [ @@ -63705,26 +64198,26 @@ "repo": "ronisbr/julia-ts-mode", "unstable": { "version": [ - 20230505, - 1846 + 20230711, + 2009 ], "deps": [ "julia-mode" ], - "commit": "a1592dee00c979c238ac3465050a305579657d86", - "sha256": "0jiy693r0v7adxhdaq1crnzzh2drbvmr8wcja23vns56liqaqvvn" + "commit": "1c5b01753bee57de2d480a80c2b267009ac93e9a", + "sha256": "1cy9x6801jvkfqs085c85128ndcc9fa1144g2mdii6ay7whl31ca" }, "stable": { "version": [ 0, 2, - 2 + 5 ], "deps": [ "julia-mode" ], - "commit": "a1592dee00c979c238ac3465050a305579657d86", - "sha256": "0jiy693r0v7adxhdaq1crnzzh2drbvmr8wcja23vns56liqaqvvn" + "commit": "1c5b01753bee57de2d480a80c2b267009ac93e9a", + "sha256": "1cy9x6801jvkfqs085c85128ndcc9fa1144g2mdii6ay7whl31ca" } }, { @@ -63888,17 +64381,18 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20230608, - 1504 + 20230706, + 139 ], "deps": [ "cl-lib", + "org", "simple-httpd", "websocket", "zmq" ], - "commit": "1fb77da2d394b905f9dfa325a9d6ef9e2cf52541", - "sha256": "1n7ghmi4r1c2f72nyd8ny75xkblz5wlhcnzbznl94masg1pw52sf" + "commit": "1baabc8f2d0631f8f4308400f9a53f1aadd58d14", + "sha256": "0kki4rs1hc3vpxf6i3lmwjz2slp9wpq6x7p6s2716hvrdbhaw8h1" }, "stable": { "version": [ @@ -63948,29 +64442,29 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20230611, - 659 + 20230612, + 1546 ], "deps": [ "f", "s", "transient" ], - "commit": "30ab3e8833a2723e0331bcebdbc79a4a4369be11", - "sha256": "1sbrhr7z4cb7lka15i0qw0c4x786xjzjgix9dzghvi4q16kmkhjp" + "commit": "e5393959ecfa935de99757ea83da2ad6777e5def", + "sha256": "0lrb1kczsnjs3ni72k912b08jssymy1hm9nj9ajz2vv9m71wjizl" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ "f", "s", "transient" ], - "commit": "141daaa4b0dc07fe25423609dcd14441a9f2613e", - "sha256": "01z86a5bfpgsczy4xbzl6wwg5wwcjnjb7za7xsdv8lvam1s4868n" + "commit": "e5393959ecfa935de99757ea83da2ad6777e5def", + "sha256": "0lrb1kczsnjs3ni72k912b08jssymy1hm9nj9ajz2vv9m71wjizl" } }, { @@ -64035,20 +64529,20 @@ }, { "ename": "kaesar", - "commit": "201fac8639e59dc923ea31da1f84a99f83d51b47", - "sha256": "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l", + "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", + "sha256": "17yvidhc8pbnxd8xvcxwhnns9x7xp57d0dlwj7aamdvavqhnajrg", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20230221, - 108 + 20230626, + 2314 ], "deps": [ "kaesar-pbkdf2" ], - "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020", - "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv" + "commit": "740eaea4d2510b78d30cceabf4be2c3daca66cf7", + "sha256": "04dswlg8l9f69aav0ns6c4q4asjv9yi6sv5wn49xj3agj15qzm6p" }, "stable": { "version": [ @@ -64065,26 +64559,26 @@ }, { "ename": "kaesar-file", - "commit": "201fac8639e59dc923ea31da1f84a99f83d51b47", - "sha256": "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc", + "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", + "sha256": "0kbpvh3fbrcif4vizh6s3024a07qj82cxp7h6nbzdgjcn8whnbrl", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20230221, - 108 + 20230614, + 332 ], "deps": [ "kaesar" ], - "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020", - "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv" + "commit": "be615884cbbb9838c5e6655abf7f112a8df03a06", + "sha256": "1n79kpa05hwnvjqgjmbmxh567cv6507f34all18ng7ywwjv5akb0" }, "stable": { "version": [ 0, 9, - 5 + 2 ], "deps": [ "kaesar" @@ -64095,26 +64589,26 @@ }, { "ename": "kaesar-mode", - "commit": "201fac8639e59dc923ea31da1f84a99f83d51b47", - "sha256": "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry", + "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", + "sha256": "18hb1rzpp3b1smn55b0wb4hwfbpmhkg6f41l251caraxnmx0cs5x", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20230221, - 108 + 20230626, + 401 ], "deps": [ "kaesar" ], - "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020", - "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv" + "commit": "fd833c69ad3ced4a890eb162f4399d79a8ec199c", + "sha256": "1km254qjhggawqvnlakzcrpbv5j6lacz9nbxqxa2gy52ww1ngsd6" }, "stable": { "version": [ 0, 9, - 5 + 4 ], "deps": [ "kaesar" @@ -64124,6 +64618,30 @@ } }, { + "ename": "kaesar-pbkdf2", + "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", + "sha256": "1hw5s8rv7cnvfmz3pk25r94svjvdz361knj05qzg8fmmdl4742iv", + "fetcher": "github", + "repo": "mhayashi1120/Emacs-kaesar", + "unstable": { + "version": [ + 20230626, + 2314 + ], + "commit": "740eaea4d2510b78d30cceabf4be2c3daca66cf7", + "sha256": "04dswlg8l9f69aav0ns6c4q4asjv9yi6sv5wn49xj3agj15qzm6p" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020", + "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv" + } + }, + { "ename": "kakapo-mode", "commit": "a43f0f1f6a0773240a51d379ec786c20a9389e7b", "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss", @@ -64411,15 +64929,14 @@ "repo": "seokbeomKim/kconfig-ref", "unstable": { "version": [ - 20230220, - 1207 + 20230805, + 737 ], "deps": [ - "projectile", - "ripgrep" + "projectile" ], - "commit": "dfb127fa5ac003a06f108d2e876c84a1931e5678", - "sha256": "1rzqj7if1qk59rhp9ddmw0hjf52niacdvyacpdcyc7v7m49bnwil" + "commit": "d2f27295053805c5ef4eea5f74e1920f4a24cb25", + "sha256": "0ypbv9ydwdkph9jhg7bzwskz6ihdwidqgxbyspb8mwwgrsq91zgi" } }, { @@ -64469,11 +64986,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20220923, - 958 + 20230709, + 1321 ], - "commit": "7fbfd987d35e29eaab2ebad4f0ed6ee2e2adfe28", - "sha256": "1d5clcjqp48m5282my3akp47h996xn9jxr8kxs7pkz18wixy48aw" + "commit": "c0d24fdad4248e0291685b47a02df54e9f980aba", + "sha256": "0bd5jp1qy4d4v71jfn3qp7rfwfbjvsbcmk9c6m4dympv1w9dp56d" } }, { @@ -64700,26 +65217,26 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20230513, - 1829 + 20230617, + 1128 ], "deps": [ "compat" ], - "commit": "cbdedd8a1ca15c43888e9dcf06e9f1f49c04727c", - "sha256": "1hri91g6c0507vaisx3c0xr52xwy82j3vqk0irf30mcrv1j9a5hd" + "commit": "0b16d6aa3ae965bcd6b4d1fd0173cfde9dc8e275", + "sha256": "0nqx53a1hjgibqrmkdic6syqb2fb5fkna0k5dbbg6igb5k775c8r" }, "stable": { "version": [ 1, 3, - 0 + 2 ], "deps": [ "compat" ], - "commit": "cbdedd8a1ca15c43888e9dcf06e9f1f49c04727c", - "sha256": "1hri91g6c0507vaisx3c0xr52xwy82j3vqk0irf30mcrv1j9a5hd" + "commit": "0b16d6aa3ae965bcd6b4d1fd0173cfde9dc8e275", + "sha256": "0nqx53a1hjgibqrmkdic6syqb2fb5fkna0k5dbbg6igb5k775c8r" } }, { @@ -65043,34 +65560,34 @@ }, { "ename": "khoj", - "commit": "2d2fb91173b05871a0bf56d09f264ca44ae27c06", - "sha256": "0jcjn8va5hqx7pgpz42g3djbrfji3b8nmp2mc1v2zss124nx715w", + "commit": "be86915876f3724f2364a183319b59aabde1452f", + "sha256": "0n23wr9gc0d3avrjqsf5387nfdglwn34jq8jyzs14yq1k5zwmdhm", "fetcher": "github", - "repo": "debanjum/khoj", + "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20230609, - 1306 + 20230802, + 655 ], "deps": [ "dash", "transient" ], - "commit": "c68cde4803aa1e06ec4b402bdbf4c87e1fb6ee76", - "sha256": "1v1m47c73ssnz8i2qh0jbr1r19p9cfrkm5jixgyxf2ar9m1zcqgr" + "commit": "e6e3acdbe41ab98a538c217309542e88b9d1d57c", + "sha256": "0pbcamjkxcs1d3n7psp0ikwg7fkll5x9sbb6392wmncsx1i441rs" }, "stable": { "version": [ 0, - 6, - 2 + 10, + 1 ], "deps": [ "dash", "transient" ], - "commit": "ebb5d7b8e5d51f54c03bd363442fd4f48153028f", - "sha256": "18fbhc74q98kf1ki5wssx99b3dg7m6jd61l4dad0399pm8bsaw7s" + "commit": "e6e3acdbe41ab98a538c217309542e88b9d1d57c", + "sha256": "0pbcamjkxcs1d3n7psp0ikwg7fkll5x9sbb6392wmncsx1i441rs" } }, { @@ -65238,20 +65755,20 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20230520, - 746 + 20210318, + 2106 ], - "commit": "bd041aea52d96161fb610a5f1485a7375a0531e1", - "sha256": "1rm3c1jdb1nmji448rk98jmf6kgxi4frwazpk6pmhl8m52d1snbw" + "commit": "db86b06b9b72e514c122e3f54a0bce74adad44c5", + "sha256": "1v14gsk1fal8xqpy8myk02n7s0f0yzpcmgf8a0mizh858y1sbxxv" }, "stable": { "version": [ 2, 2, - 0 + 1 ], - "commit": "bd041aea52d96161fb610a5f1485a7375a0531e1", - "sha256": "1rm3c1jdb1nmji448rk98jmf6kgxi4frwazpk6pmhl8m52d1snbw" + "commit": "344768bfefd2e8f5302cc9dfb8ca41991ce6f7e7", + "sha256": "1bqqpywry23hg7vc3rh0m9svmkfk40vgaji8sy0w7m15gzw9zc42" } }, { @@ -65270,18 +65787,6 @@ ], "commit": "444f686a7f75db788d54f544b923a3532732eb8b", "sha256": "1pdm69ghdfzv738c5y1b61d12cfafkvcmmjf0v4m3qai2xxqk4sn" - }, - "stable": { - "version": [ - 1, - 0, - 2 - ], - "deps": [ - "request" - ], - "commit": "86c163cbc0515e9e516f05e809796087b1d3ba8d", - "sha256": "0fh5bx6c2jm492z70vq46b6fmsk4mqagxc75xcizl47s80wq6yvn" } }, { @@ -65307,14 +65812,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20230403, - 2156 + 20230801, + 1603 ], "deps": [ "compat" ], - "commit": "5652ba0bfa7a4c03daffc301c9ca4a9899c4f440", - "sha256": "0qm0pxzarn2hgim551gzjdh9r6a6i83hi96fslf6h2w85wp0zh6c" + "commit": "18e3b1b73fddd234176a7e6633da67c30d13d107", + "sha256": "01f286547d8g1l084i6yym6p2q6p8frwhm0cvmgfml9sj6fymv3h" } }, { @@ -65333,6 +65838,30 @@ } }, { + "ename": "klondike", + "commit": "07468c723e34a5c25e315a07649a0af2d62ae6ab", + "sha256": "0fa28w572cq5jf4n9sgs0bb9r5q2s1c0khgrwhgbkmzil42mlbh4", + "fetcher": "codeberg", + "repo": "WammKD/Emacs-Klondike", + "unstable": { + "version": [ + 20230606, + 704 + ], + "commit": "244278348e913433450329c6c863da06167a3f20", + "sha256": "1a1r8qi21hbx8fr8ihvg6bkg4sg4fmpw9vy8vq5dx106136s4y7z" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "0b14436e3ca08e1efbcccd330386e5418cbab126", + "sha256": "0qqfaxv8kfh4yxlpq21kmssa1yvdzhhs2p7wrkp4326pbdkqzjnn" + } + }, + { "ename": "kmacro-x", "commit": "207d9fb6f29a426ce1aeac517ae31d69aa1f4d8a", "sha256": "06q9lv3a4jsn6a9xfp0aw980pl938h817bagqq5xkh0q169f34qm", @@ -65476,11 +66005,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20230531, - 901 + 20230704, + 1512 ], - "commit": "422e294cb08356d61eef06424e85f400f395b1b9", - "sha256": "0mz0ysi23sscix1xqrfa82a79xknvmafgyskjv1md2masvmf4l3p" + "commit": "85d614f9a3952bc744b597dcd55e83e83a413f31", + "sha256": "0xfr349nwy96dl6y7m3y086wlb8m7s7q66bzp6c66pr8jrkk6vv7" } }, { @@ -65905,16 +66434,16 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20230507, - 59 + 20230805, + 30 ], "deps": [ "memoize", "request", "s" ], - "commit": "3e33e532aea48ffadde4e4e48efd26523d362a0d", - "sha256": "00likgg268qff5gqrrq3hmimkf97qkqnazdbmnxkfprxjdqwjmzm" + "commit": "01d481ca41cc122899ad94a97153f81fe6e7f65e", + "sha256": "0nyip0kli5baiyshj1389najk8zzh948i1kmq287nzsy02ljgyfv" } }, { @@ -66003,30 +66532,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20230513, - 1154 + 20230728, + 1221 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "39fc3d46868866b69a4abb342805d8fa95c970cd", - "sha256": "16nqv01j9p919834ynl11sihklhb1102m5k7nppka5752rgqw8qf" + "commit": "e16893661355d35db3a48f0821981b72486d4841", + "sha256": "1nz3jm68qk6gsfv5g7yz5f690vdva382c47djplswfky3kkyq9rm" }, "stable": { "version": [ 2, - 3, - 1 + 4, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "60243e461f2d1e393265f46fcd290b0a64a0b1c4", - "sha256": "0ccb0crc4z2jc7f0b4pxi713zz8yq2pcmspq2dy8w2cn4x83c8jy" + "commit": "193d86ca621a5a920b91b67ff09818bab29204ff", + "sha256": "04mi5awvxlqv0izbsbxi5hxx90dwcnxkw2j3iiiqsf3i6a2389zs" } }, { @@ -66176,11 +66705,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20230527, - 1312 + 20230722, + 1141 ], - "commit": "06f960f733e5958c4fe0e52db666ce6f6710f508", - "sha256": "0b1571kvfg3xq8fxxgklz01lfrhykd65rrz4aav26rfq7kd38lji" + "commit": "ff09e3ef89a90d0707a77d6b7f4d2d7d67f4c03a", + "sha256": "1q3fblbg4qj5zjzgjqs55ywm504sghg7r9n5v9nhsa5k6gx6msw2" }, "stable": { "version": [ @@ -66643,11 +67172,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20211226, - 1633 + 20230803, + 729 ], - "commit": "9eb18e8c9c375aa0158fbd06ea906bfbf54408fe", - "sha256": "0bxl842qnijz29bglp1zpmv07ga91q999l3gzk4k5n1a96j03qsc" + "commit": "fce3378f987bf118a0a5f1a24c4408ac920f858d", + "sha256": "11fw6qh9fdy8f1zkfa0n1dkd0ppk9b96mgmaxnbb8zxivdhj9nhc" }, "stable": { "version": [ @@ -66797,8 +67326,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20220501, - 1007 + 20230611, + 728 ], "deps": [ "dash", @@ -66806,8 +67335,8 @@ "flycheck", "s" ], - "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", - "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" + "commit": "99d6a34dc5b12f6e996e9217fa9f6fe4a6af037a", + "sha256": "1m6kzhlifzb2qyb1y578r4jbfm73lxs611zgqjng9nbhprymal33" } }, { @@ -66903,11 +67432,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20230605, - 1126 + 20230727, + 615 ], - "commit": "ea29af6aebe746e5e8a74d36f25afce807c0ee0e", - "sha256": "0m9k1d7jkl7lmzwnbqqhqvmha0c2qws7vrn6kj9l40blhxjsigj8" + "commit": "846dd204dbf7d181947a5b6445ca19b37b3b06b0", + "sha256": "1rc7b5l5v9d2f59n92s3rqjnsr9gclgbzn1595m2j2lvw6li7pmn" }, "stable": { "version": [ @@ -67077,11 +67606,11 @@ "repo": "drghirlanda/lesim-mode", "unstable": { "version": [ - 20230609, - 2202 + 20230627, + 1350 ], - "commit": "2e3be0e7b00996ac52e9f3b4b5b08f319b3ef6dd", - "sha256": "1i2bssqmjbk0m1wlgpzws0rmdaygxayhx8fcbndkys7m0qfzhykn" + "commit": "74bffc63058f64b3399e685cf0fe0a8f18cc491e", + "sha256": "1mwr5y9lr3rj91h2fzl70aasivrkkyv280vk7qs8ja63six8pg9b" } }, { @@ -67251,10 +67780,10 @@ "version": [ 2, 1, - 1 + 2 ], - "commit": "b969afb9b5928d33dcaef636ed9020e620858190", - "sha256": "14bffvmyq6czfhvmcw332a7y4cyr27f75kzk46qlhlqs6l3rahqx" + "commit": "6cbfdffe95caa65a659074c1c9d389fd4a6c1350", + "sha256": "180hz1p2v3vb6yyzcfwircmljlnd86ln8z80lzy3mwlyrcxblvxy" } }, { @@ -67564,20 +68093,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20230302, - 1616 + 20230803, + 1446 ], - "commit": "d1073474efc9e0a020a4bcdf5e0c12a217265a3a", - "sha256": "0ipk7l2dhfc6qv3nqdyhxasswyl11xg9cklka6s3hv4sly0c2lma" + "commit": "bdd69fa7cd9adc8756ca9e688ede0335672e29cf", + "sha256": "1625fwwc7n02zgppshmqqvzw0792527irnwx1qhdslx5pvcjbljp" }, "stable": { "version": [ - 1, - 2, - 3 + 0, + 71, + 0 ], - "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4", - "sha256": "12c0g379jx2m30c3m9rarhh7hwg8sjsb2bbh0j6f3k51ya90kcbh" + "commit": "bdd69fa7cd9adc8756ca9e688ede0335672e29cf", + "sha256": "1625fwwc7n02zgppshmqqvzw0792527irnwx1qhdslx5pvcjbljp" } }, { @@ -68293,14 +68822,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20230127, - 153 + 20230805, + 436 ], "deps": [ + "dash", "s" ], - "commit": "900bdd12c0a6e6874f60b0df99a72fd329873ea1", - "sha256": "1kbx1i977pyv5ckg6d5c5p806nlrl6y06jmcjwi90yri8l0bia5y" + "commit": "b3db1b5249e6e6fbcde2dcc0e9ac5b2d2bbe77c2", + "sha256": "102ikmds9d3ifwz2kl94hg8namgpqzdgzv3j07pzxavllkz4kpip" } }, { @@ -68566,14 +69096,14 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20230603, - 1123 + 20230714, + 39 ], "deps": [ "seq" ], - "commit": "34cadf22e3113a8fd51d2664a2f1538f8b40f679", - "sha256": "12p6gygigh4vk48banwamhzjwxh4misvfizyrrzn4z5wriayq1sl" + "commit": "5c454f1a83c698668942603e595cec36a5211768", + "sha256": "06n6lb3gm0xzxqmrljk43szyc7nwc9f0pgllf8la34wagi39wwqg" }, "stable": { "version": [ @@ -68708,9 +69238,9 @@ }, { "ename": "loccur", - "commit": "72550b043794331e85bc4b124f6d8ab70d969eff", - "sha256": "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h", - "fetcher": "github", + "commit": "71e05553c92d5a92d0e57a7637c86ee16f498241", + "sha256": "1rh3d9y3gfj2db4z03qlcnxrbww86ldz4641vcsvykrywanskv7g", + "fetcher": "codeberg", "repo": "fourier/loccur", "unstable": { "version": [ @@ -68955,28 +69485,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20230428, - 2158 + 20230730, + 1641 ], "deps": [ "datetime", "extmap" ], - "commit": "856ebf1aa9a8d0ebde3352ba14bad2fbb78c82a8", - "sha256": "06lffkj47cv224f5ccxfa7d230ybvmdl8wniqr51g1xyaz3dlnr0" + "commit": "32d833559100da489896e8791c9c6284ccb32ea5", + "sha256": "021363pgvapvmb08dy0x6m4lb8bvd6nvwix075hm7hxg03a9kvkb" }, "stable": { "version": [ 0, 16, - 1 + 4 ], "deps": [ "datetime", "extmap" ], - "commit": "84ccfa83150769701a63bb28a918f7db51f04235", - "sha256": "12m0wqzfbphpz88fnawn5kb7yaayxh3yajbf6zzzbnyc8rjajcr6" + "commit": "ae54a3f4d86be541d3d25e36db3f615cb2d7c4f6", + "sha256": "1454dhy3nzhbqfg02n4kx9q5q99a9299gjwlx94zd6i5yhvi3b6c" } }, { @@ -69233,15 +69763,15 @@ "repo": "LaurenceWarne/lsp-cfn.el", "unstable": { "version": [ - 20220822, - 1545 + 20230701, + 1533 ], "deps": [ "lsp-mode", "yaml-mode" ], - "commit": "55203d41d767c091511599fca236c1f9c39cd58a", - "sha256": "0xmv3aqlfp4qk9vmahzmn58m8m0i7929x1mwy2rh33jx08v67xv3" + "commit": "afef283ae27dc7dfbec997982ba5dc0e062f0a03", + "sha256": "1nfq1x6xi345hyk92gac3kpp1jkn1gfml810di3m2pp54j75wiv7" } }, { @@ -69296,8 +69826,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20230508, - 2051 + 20230627, + 1601 ], "deps": [ "dash", @@ -69307,8 +69837,8 @@ "s", "yaml" ], - "commit": "1fa2fec2cc6c081b81fbb74bd10d10c1d19693ca", - "sha256": "1sbb5c17qvjpxvbyzcpam3sc2p5xckmq4hxn3j76b70qjiz6pjiw" + "commit": "175b587e0def23d4560abdb06b12e05ea469aaea", + "sha256": "16rzvz159zc963via5bajrs2xhhl0d73ycw3i7calqsp31x4747q" } }, { @@ -69459,8 +69989,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20230507, - 517 + 20230801, + 943 ], "deps": [ "dap-mode", @@ -69472,8 +70002,8 @@ "request", "treemacs" ], - "commit": "961f1a13e3db9a6b395584be99ef9572bb414e63", - "sha256": "1hwkbp3zc9m1nch19krhqbd34vgyq4zkd59p7ypy28ax70xzribz" + "commit": "79882a2d2956c00a15b9497903ba0cc4da754cba", + "sha256": "1nifbr9pg75x3f4npp6lyy59j8r61r7sga536yn3afk6wf75kip9" }, "stable": { "version": [ @@ -69584,26 +70114,28 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20230421, - 1814 + 20230717, + 1707 ], "deps": [ + "consult", "lsp-mode" ], - "commit": "51bd8a0306a21c81a0c765b1857c534a29d92877", - "sha256": "0yj5pgq8nr922fd2m842sqjnl77vag8d61qn2llnfvxrzl1g625l" + "commit": "7d70e07a02f7b808ba97f1ed7d63491ab8f55900", + "sha256": "0zkg2jj4a8ra104k05yz54njzajz8qhsk93xn7yln76133pmhhn6" }, "stable": { "version": [ 3, - 5, + 6, 0 ], "deps": [ + "consult", "lsp-mode" ], - "commit": "51bd8a0306a21c81a0c765b1857c534a29d92877", - "sha256": "0yj5pgq8nr922fd2m842sqjnl77vag8d61qn2llnfvxrzl1g625l" + "commit": "b7193633509fe4a58bb70ebae2c8e970f5a843c8", + "sha256": "027xhrxjwh6d78yidwfpqp2cbgv0qlafm6z8nqkf6lh8fxnr8ig8" } }, { @@ -69646,8 +70178,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20230406, - 755 + 20230721, + 1656 ], "deps": [ "dap-mode", @@ -69660,8 +70192,8 @@ "scala-mode", "treemacs" ], - "commit": "a11099b79f032aa2fc92a727d2c1e40987727d65", - "sha256": "147w698q6i393pcynwv0g0p7wwfsh6zcq7r8p3h9fk155gl7pwqc" + "commit": "926e680add8a9648b20962bc97336343456236a1", + "sha256": "1hz1hxqrkmr9xkpdbvl0ngjmm6r762s0yfc4sxkbxxiacb11g5ix" }, "stable": { "version": [ @@ -69691,8 +70223,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20230608, - 1715 + 20230806, + 1507 ], "deps": [ "dash", @@ -69703,8 +70235,8 @@ "markdown-mode", "spinner" ], - "commit": "18c94fa20c7039471dbca1dee7e68d9025f0e7b2", - "sha256": "159lcwnywckmvl5pscf1jwvgyw9b2sdpsl90az1jkdkqiss81apf" + "commit": "5c36d25a4f411bfbe01ced442a186b75c661c1f1", + "sha256": "1z69rwp0dhz1l714b60xzcqh0nga760fyiwfzhsn3wcb0fb91mxf" }, "stable": { "version": [ @@ -69885,26 +70417,26 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20211204, - 1209 + 20230731, + 1458 ], "deps": [ "lsp-mode" ], - "commit": "abf4d89ecf2fa0871130df5fce6065b7cf0a2721", - "sha256": "1cad09y36bf97mhgg7xncf4m856ys8n7zlbsgag5h5rja1ha71nl" + "commit": "7bda327bec7b219d140c34dab4b1e1fbd41bc516", + "sha256": "1i7l06cw25fb202fbhqhx8xyfynz6sinka9ybh8n4cxjq19ffm8b" }, "stable": { "version": [ 0, 7, - 2 + 3 ], "deps": [ "lsp-mode" ], - "commit": "5856c08d6393c10951f39b993a8d7bf2d506b44f", - "sha256": "0m55i7w1am55c7p35il3i06d4za8z5qamfwb8nki5zhiacw26bkw" + "commit": "7bda327bec7b219d140c34dab4b1e1fbd41bc516", + "sha256": "1i7l06cw25fb202fbhqhx8xyfynz6sinka9ybh8n4cxjq19ffm8b" } }, { @@ -70048,8 +70580,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20230504, - 516 + 20230703, + 629 ], "deps": [ "dash", @@ -70058,8 +70590,8 @@ "lsp-mode", "treemacs" ], - "commit": "eeb96b05e677147cf40292b86a1e5e8f73a8a586", - "sha256": "15nqmn3f4qijr38lvfr9s06l7hmc408r65gmhvzf1sgai3h42b3g" + "commit": "7be7f30c2ddc6d392a1ff0304d439d0cf14b2771", + "sha256": "1g5sp5bcv1cks48rvvw0j8cczhnlnpx7lx05pvalaxxhlnyvx9zj" }, "stable": { "version": [ @@ -70615,20 +71147,23 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20230610, - 808 + 20230804, + 949 + ], + "deps": [ + "compat" ], - "commit": "d1a117bef989e039fbb72ac542133c73cdc70758", - "sha256": "1w4qm1pf9wcbsikjgwvc074d1yil55vhr65n38rqf0v1hdknj00g" + "commit": "aa75213fad924a2ca72c6e2ac526f4d40a53682c", + "sha256": "0g0k0fxbkjkkbkajkymrwigfb381kvy6vfan6hlkbjhqp5y631fp" }, "stable": { "version": [ 0, - 1, - 0 + 2, + 1 ], - "commit": "05290e30f57379adc73cfd932b728d792039a42f", - "sha256": "0lym5wgb3jbs3bzc77y4i2d6577kyw10973l2h3apbhfnj69gpfj" + "commit": "545232bde1f8f9c6b74a7a31d9e1620d23979a9a", + "sha256": "1csjnda32xwn8yhf58n4b7j5p8si3wilds1vby5nb5j7aq8baaxr" } }, { @@ -70639,19 +71174,20 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230606, - 1402 + 20230804, + 1052 ], "deps": [ "compat", "dash", "git-commit", "magit-section", + "seq", "transient", "with-editor" ], - "commit": "714fc59efbb5c0f28355895139c165a994403e31", - "sha256": "1ww0b5cyb1nf0swczdspsz1h0mmywnvjhwn7h9abilzj0ymci7gl" + "commit": "dd6ecd5fe59087b5658f0a99e1d946e7fbf2dbea", + "sha256": "031ss0ls8z1wwz7kzasrdwrnvbs21fcyqmhxr8w4k39yanhlh7x8" }, "stable": { "version": [ @@ -71141,15 +71677,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230521, - 1803 + 20230731, + 912 ], "deps": [ "compat", "dash" ], - "commit": "80959650b24a9c849b736234b56bc3d8aff2c0b9", - "sha256": "1p2lr5v9cn3jb3s73c3rhvfsywznj1lgjvmjzvfp86axhl3f4i05" + "commit": "e8152c76bf636805c0eb9027083d0ff10d28d1a8", + "sha256": "0i1wi8gbngdykbzrv9pf111qbcwi52lyhr1a3vmswwcr9d33z2qf" }, "stable": { "version": [ @@ -71363,19 +71899,6 @@ ], "commit": "fd6c86c066b14bbf78644d38eca9711d6d9544a1", "sha256": "0mq437z9ng2i2amkv26bw9ak7ddw40h2q4wmpf517bv2s7qxfgi1" - }, - "stable": { - "version": [ - 0, - 4, - 1 - ], - "deps": [ - "magit", - "vcsh" - ], - "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca", - "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj" } }, { @@ -71742,11 +72265,11 @@ "repo": "Iacob/elmame", "unstable": { "version": [ - 20230526, - 1453 + 20230804, + 1538 ], - "commit": "f91cab8d32ceffdff9817f7c2371d7c43cbdd1ec", - "sha256": "1jp3h037w2r8w21yp91bxg722nwzz5a082g6dals8ln0a5yz8gsh" + "commit": "2793335a9901bba6071abb94f5124d94c04343a5", + "sha256": "1d54gdqs5w7iffcrai6k5l6l1vllqwrzjy66phz9p49vmlch2v8n" } }, { @@ -71828,11 +72351,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20220426, - 1131 + 20230805, + 739 ], - "commit": "4991bbc4b17308f5dc53742dc528cbfdc467ee01", - "sha256": "1wykcvsw54fla7n01xqclbm4vmfpp4iikw3aqb7m04h0ayx56y02" + "commit": "8f3d6497aca7b0e6a8dc759b307d20fcb68920d9", + "sha256": "0az2w80iiza3s2f4qr10rkd70dgj86vklfv35ibvm4g1fxw4i5bz" } }, { @@ -71981,25 +72504,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20230527, - 1021 + 20230805, + 915 ], "deps": [ "compat" ], - "commit": "ae454a2aa0c5d85b5e151938b310e7d16538157d", - "sha256": "1hvmw7dnrkffn7wn6b9kbyzfqjysypmmkvvfadlfdj9bh921y27w" + "commit": "17fffc685731a1459fb5faa9e376b75ebe225d5c", + "sha256": "09p96fzlibak0ma2rpvyzjsrgfr74jwdbp0lgdqm2z1nlpv1hl08" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "4c7b852b183e10dc437c7e41a7ef37cf3ccd8db1", - "sha256": "0zf88pvjs3v231rpk4km03n19xyfx6hn0fny08y4pv42dz3xkcwg" + "commit": "8cffd7dcdb411f8796258183a4224653d407ae3f", + "sha256": "0fjbif2l5fj4xjb9drqfc8zxla8y7mha0imdd1nm4x83i0y4fa6l" } }, { @@ -72025,25 +72548,26 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20201219, - 232 + 20230805, + 1701 ], "deps": [ "choice-program" ], - "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", - "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" + "commit": "22ce137450890421c8dce79943c96dec79a65d77", + "sha256": "0fw3198mlxa22pq0qg0xakckc3hi540nv72a21gh071ii2mc2wl1" }, "stable": { "version": [ + 1, 0, - 3 + 0 ], "deps": [ "choice-program" ], - "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", - "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" + "commit": "22ce137450890421c8dce79943c96dec79a65d77", + "sha256": "0fw3198mlxa22pq0qg0xakckc3hi540nv72a21gh071ii2mc2wl1" } }, { @@ -72077,14 +72601,14 @@ "repo": "plandes/markdown-changelog", "unstable": { "version": [ - 20200120, - 2253 + 20230805, + 1720 ], "deps": [ "dash" ], - "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96", - "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x" + "commit": "403d2cd1cff932ae135692d57062824892e01d13", + "sha256": "1j37x4rqx2syhrmv1iwq3r3myc01jsczszm7bja3rj156hc6fqz0" }, "stable": { "version": [ @@ -72095,8 +72619,8 @@ "deps": [ "dash" ], - "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96", - "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x" + "commit": "403d2cd1cff932ae135692d57062824892e01d13", + "sha256": "1j37x4rqx2syhrmv1iwq3r3myc01jsczszm7bja3rj156hc6fqz0" } }, { @@ -72107,11 +72631,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20230607, - 320 + 20230804, + 305 ], - "commit": "f3ee31ffc28b3d8e86da2208c87eac75fd6e6eae", - "sha256": "0kqlvhyp52whr83fnrwkib0fbz3skp77rlylc76qgxsdw3zid1a7" + "commit": "50ac14ffe4e23224c74adf2b90a4833ccb62a416", + "sha256": "1jcygpcf6mwjhs8bzzl7zkvs0zfvm1r9rp9ngjji55av1ypz2ncn" }, "stable": { "version": [ @@ -72145,8 +72669,8 @@ "repo": "ancane/markdown-preview-mode", "unstable": { "version": [ - 20221006, - 1601 + 20230707, + 803 ], "deps": [ "cl-lib", @@ -72154,8 +72678,8 @@ "web-server", "websocket" ], - "commit": "85fbfec507a222326695a3b91ff7306d0c4f94c6", - "sha256": "1rsglacdj38xvrn2p5m0w26pmq5xl9hn8zi7pflgqhlx9fdjpn8s" + "commit": "68242b3907dc065aa35412bfd928b43d8052d321", + "sha256": "1fxlipd2q0qbyzmjqrxvg2jfb6rbpsngxvsz66j26nx5k0p98168" }, "stable": { "version": [ @@ -72265,10 +72789,10 @@ "unstable": { "version": [ 20220702, - 1154 + 1811 ], - "commit": "9c846f58575a446812f7bade284021b625976757", - "sha256": "1nx7azwyj4q0a76n76496krv07rxvqbla3j5z8jg77yrvbv40vnl" + "commit": "048eec3278ab82c1040d063d4f677f01090d4dab", + "sha256": "096i1w9d39093qldr4dsdcrsx0khzqjwh69v2valh9sdv3x82mf5" } }, { @@ -72437,16 +72961,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20230525, - 1812 + 20230725, + 1217 ], "deps": [ "persist", "request", "ts" ], - "commit": "dfc40c0bc2c8f1653ca71335b6ad99230f38067e", - "sha256": "0209977bw7q13vffd18gnz6f9kg8i1yfjw1vv6w37s6yxrxa6kf4" + "commit": "20dec8871c9bb5f5e418bfc197e7533b5e3065e3", + "sha256": "15cfjny99yw5frdp8nlyazlwgscvfvbinsj0fbdfprxf50k2zjs6" }, "stable": { "version": [ @@ -72597,11 +73121,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20230426, - 2216 + 20230712, + 1655 ], - "commit": "3048e9fdf4d1fa0a4369ff85581e21750d37be16", - "sha256": "0jpf92qr7f0i15wxlsb7dvw65w35sbwgyg3j7gayqj6xbnv47ysk" + "commit": "9c03ebf876eb8af911d7ce6edda581efa1346f41", + "sha256": "095krmn2h6ckfmhwi14nywn278k2ivay50kjssn7sn267i0gbkyp" } }, { @@ -72712,11 +73236,11 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20221201, - 1855 + 20230804, + 504 ], - "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", - "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" + "commit": "f4512a7f85dcc858404922deda1aaa952baf4e00", + "sha256": "08adj17bigsrf7jjrsvk4cg0ipj9a430cgi4h7ickarns2wwlia2" }, "stable": { "version": [ @@ -72858,19 +73382,18 @@ "repo": "ahungry/md4rd", "unstable": { "version": [ - 20230603, - 1450 + 20230725, + 2316 ], "deps": [ "cl-lib", "dash", - "hierarchy", "request", "s", "tree-mode" ], - "commit": "9f649e9b014438ad2289e6194a20c5f719e4fe8a", - "sha256": "1sylw5i1wm5x0696ijwwlgzp3ldnmiajxqqw8pf8plwhnff1fdz9" + "commit": "2fa198af749e9ddb759e052d911f56a626088903", + "sha256": "1p6lrx0basgkj2p893l1lav2mldd8gjm5p4911w7mvpzps1fhxjc" }, "stable": { "version": [ @@ -72898,11 +73421,11 @@ "repo": "jumper047/media-progress", "unstable": { "version": [ - 20230527, - 2209 + 20230805, + 2231 ], - "commit": "0b22f92cf4bd40df6057485f63079c779eda9696", - "sha256": "0s0szf3b12nd449pxzdjy2v1i236acg3vy5k9m5ydaznc6z085zj" + "commit": "951742e9e741a71bf527a23bf56deeedb12af7bd", + "sha256": "0f6h1w8nz9038pmlgmabv28qpq3n80fs812a4gz6773gknd50cjz" } }, { @@ -73178,20 +73701,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20230512, - 419 + 20230801, + 37 ], - "commit": "f6a1b48eb5678b225666b8726962d26a81588d8e", - "sha256": "1nzjnrsb6b12in5fvmmg32k0k2nlfbsw7m2ka4dknslcb3415wz0" + "commit": "5af47984895fb7b9a5a65a8d919ba62680a975da", + "sha256": "0q0yyhqrmvxqf4kw37rk9a44csyb2w88xw19z2r2w04lflp9qs8d" }, "stable": { "version": [ 1, 4, - 2 + 3 ], - "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", - "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" + "commit": "023183656e86165c293359969ddf6f2566b4cb65", + "sha256": "12361i7g1kg7hyhxzq3swxjad64zxj33dkjgwx6gc7zd640hqphx" } }, { @@ -73202,21 +73725,19 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20230510, - 1520 + 20230726, + 900 ], - "commit": "4bd7b7f42c460c0c85a267eada352b627fd54d20", - "sha256": "12bn3saifi0vcbys975nzs0k7vkl7bv4qpqk5fgmsll8wnaf028p" + "commit": "fd1bac38fcfe601094ce8e01895333666733e664", + "sha256": "1411ccdcwik11pay532vgh4mksy1wy14wkaaz3kc14kb21ca0dvs" }, "stable": { "version": [ 4, - 9, - -4, - 500 + 1 ], - "commit": "d203dd96b98079add79ae797ccec555c3b3750ac", - "sha256": "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -73240,16 +73761,10 @@ "stable": { "version": [ 4, - 9, - -4, - 500 - ], - "deps": [ - "auto-complete", - "merlin" + 1 ], - "commit": "d203dd96b98079add79ae797ccec555c3b3750ac", - "sha256": "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -73273,16 +73788,10 @@ "stable": { "version": [ 4, - 9, - -4, - 500 - ], - "deps": [ - "company", - "merlin" + 1 ], - "commit": "d203dd96b98079add79ae797ccec555c3b3750ac", - "sha256": "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -73335,16 +73844,10 @@ "stable": { "version": [ 4, - 9, - -4, - 500 - ], - "deps": [ - "iedit", - "merlin" + 1 ], - "commit": "d203dd96b98079add79ae797ccec555c3b3750ac", - "sha256": "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -73386,6 +73889,24 @@ } }, { + "ename": "mess", + "commit": "8e3235c3400e4c8493add982bbba6ae27396a99a", + "sha256": "0q3y096fvwyrjqxbhpawr8iagmhafwi6461s6zgl85jc06l4fkd8", + "fetcher": "github", + "repo": "Iacob/mess.el", + "unstable": { + "version": [ + 20230718, + 1533 + ], + "deps": [ + "mame" + ], + "commit": "65392b0d0ded45de789d4deab28a4ce88de24567", + "sha256": "0z5nv47jwqq6a9wwsvx2mzh3kjrjgifc3s68khchnj2h128f1why" + } + }, + { "ename": "message-attachment-reminder", "commit": "7412f7428d16955968cd78de3bb3abcbbcd5c508", "sha256": "0hwah27sw3myka86gywjjncp0i8lnqiagklxdh6z6z4hl9jk105r", @@ -73741,11 +74262,11 @@ "repo": "ROCKTAKEY/mic", "unstable": { "version": [ - 20230123, - 944 + 20230725, + 1139 ], - "commit": "7d0a31ace0b801cb8b58a7bb61a981b67508208d", - "sha256": "1gz6fbj7l0pm6ghv40665iaik2rw3qmbrbccb84jjky2a3d6vcch" + "commit": "95dcc9fa306f579e8de6e417839841efe88ae1fc", + "sha256": "19v6q0knrkzchis3bax4h9szbiqxfk0fm83sy0zvd1gqh8jlpfh7" }, "stable": { "version": [ @@ -73791,6 +74312,24 @@ } }, { + "ename": "micromamba", + "commit": "6ac710cc0b45afa59fbc7a266c0b716fb30932ff", + "sha256": "0fd3qvd5iqdw8arpz1qlyvxlnjqkxj7bqkrqgslx6cj56pai1la8", + "fetcher": "github", + "repo": "SqrtMinusOne/micromamba.el", + "unstable": { + "version": [ + 20230708, + 926 + ], + "deps": [ + "pythonic" + ], + "commit": "ce97237986668c31d9b023348f1ef16199276794", + "sha256": "182iz522899cc7qm5dc79vnph5jmcpm2hqi259xxs2hdl6mrx8y1" + } + }, + { "ename": "migemo", "commit": "2424b0328a0198a03359455abdb3024a8067c857", "sha256": "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr", @@ -74580,20 +75119,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20230602, - 1538 + 20230625, + 1448 ], - "commit": "2ebe985f8b170b101f4f8de5f833ba5718761638", - "sha256": "1m2irxb5jvvj9zv72v2i38vrhwvvy9rpdasd646czkqpd9cy3d56" + "commit": "fc520f46780736147ab015d825c7332a9dd1a855", + "sha256": "1hps3klzl17sjdsjkgy35b7akvqs5cs8xwh9jnvcak4sfzdgzz0b" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "f977ce6dbc4ba3b4fc1ae114232a3ba67730755a", - "sha256": "1hbcnxjzckdsw95id1nfg3ldx73cjvxmg4imhs4b1zrcy3mv7dib" + "commit": "fc520f46780736147ab015d825c7332a9dd1a855", + "sha256": "1hps3klzl17sjdsjkgy35b7akvqs5cs8xwh9jnvcak4sfzdgzz0b" } }, { @@ -74711,11 +75250,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20230116, - 951 + 20230704, + 12 ], - "commit": "be393eb5c60382ed297b59f69292917bfc9bf60f", - "sha256": "1n391gvk7gzcvkwlhwid0lhlbva2a4pghb7r8mrnf8pm1imzydjf" + "commit": "1dc0115bd4864b8b8cc9cbaac75c03d764070873", + "sha256": "006ynxzakfc11lz9s915agdiiisnbfxiv9a7mj9g0890qh7isjvy" } }, { @@ -74855,11 +75394,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230610, - 243 + 20230804, + 933 ], - "commit": "4ef638c53b1eb35e8861da6bae47dca4584d2941", - "sha256": "1y71fxyg3lb19csigw0l0yyfliyciwvk2pjbs2bh74sbh112wwxd" + "commit": "a42240aa71dd80336b62868b16effbbbbb280a4b", + "sha256": "0sas3zymw5n8gs4jn3k9cbd7lsgrwzq51kc18dnffx3ijq27gl7r" }, "stable": { "version": [ @@ -75247,11 +75786,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20230401, - 1025 + 20230722, + 2037 ], - "commit": "c7f319c29e5740b03910e75e89bfb2379d4ed680", - "sha256": "0i3wn9ijq30lvp0afz6bcqq7fn55wkyshpfyrdy063p50d9kx1sh" + "commit": "54750aa2e3e9476375a32ef94714e22ece6e4039", + "sha256": "119jzkf3ccqrxrjxx5x32rgpl7nip9c333ypmssy4pmylpcqls73" }, "stable": { "version": [ @@ -75588,22 +76127,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20230516, - 1609 + 20230804, + 1700 ], - "commit": "381e5c33211de185d0c834acd61d184dde563227", - "sha256": "0nlhkgfrcp8h17mkir13b9smp86mx8x5nrqdzawmfk85dh48iqmr" + "commit": "e6bc2b6c959758bbec5125e6f478aad437572699", + "sha256": "0mhrxxfyjzvrb8q26m9kqlrc40xfnryh0vl77r3h1z4sx7ywyh5q" }, "stable": { "version": [ - 2018, - -4, 2, - -4, - 26 + 29, + 5160, + 102 ], - "commit": "afb03ddfe72dde4cf2409863a3bfea160f7a66d8", - "sha256": "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx" + "commit": "f14a3f49cb56adb4386cb264133a01b32929dfb7", + "sha256": "1mwrb6y813zwln5y39n4m7l80hr5z4qrlvvmm29ng16rngv0qfpc" } }, { @@ -76041,16 +76579,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20220615, - 1948 + 20230722, + 1746 ], "deps": [ "alert", "ht", "s" ], - "commit": "3c9af8c7994df0a1a4f0703552ea3beffb485ace", - "sha256": "13li5pqqkzj7dwgpnngnk1ff46i100qw9xknlimpy2vf2k5yqv3y" + "commit": "6beda20fc69771f2778f507c4a9e069dbaf1b628", + "sha256": "19z6539nj7rkrhljvzg468pp7gy5vgpj3hsxhfqp0djjm34gppnc" }, "stable": { "version": [ @@ -76246,8 +76784,8 @@ "repo": "danielfleischer/mu4easy", "unstable": { "version": [ - 20230207, - 2042 + 20230629, + 1721 ], "deps": [ "helm-mu", @@ -76255,8 +76793,22 @@ "mu4e-column-faces", "org-msg" ], - "commit": "34565ddb9fc74675b28ce19694485cf2e91eba20", - "sha256": "134w5sgzicbn1ycf0dq1v4g4ph6jygzqvvgniygy6rgw1gs1gmx7" + "commit": "bb9f5df374723932c848f8864c86d7b0ceacc82c", + "sha256": "0ilmrwg17pfan2v999gla180p3krbfq01r4n6df4wg1h8k8d6kr7" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "helm-mu", + "mu4e-alert", + "mu4e-column-faces", + "org-msg" + ], + "commit": "bb9f5df374723932c848f8864c86d7b0ceacc82c", + "sha256": "0ilmrwg17pfan2v999gla180p3krbfq01r4n6df4wg1h8k8d6kr7" } }, { @@ -76359,8 +76911,8 @@ "repo": "IvanMalison/multi-line", "unstable": { "version": [ - 20220112, - 1744 + 20230721, + 1814 ], "deps": [ "cl-lib", @@ -76368,14 +76920,14 @@ "s", "shut-up" ], - "commit": "625c608443f98bb34b4d5600d52c198509fb64d0", - "sha256": "0f4wkkv34990ks58dbdywlvdxw4bj7d4h0rjy64qxv7n14blndgv" + "commit": "06ea7294c4e4ace0c3253b7952a6d937a169eb55", + "sha256": "0iby3h9ypmnd35f9mvs53cghlpl9jjj97z5p191y99k3w4dzp4z1" }, "stable": { "version": [ 0, 1, - 5 + 6 ], "deps": [ "cl-lib", @@ -76383,8 +76935,8 @@ "s", "shut-up" ], - "commit": "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7", - "sha256": "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh" + "commit": "06ea7294c4e4ace0c3253b7952a6d937a169eb55", + "sha256": "0iby3h9ypmnd35f9mvs53cghlpl9jjj97z5p191y99k3w4dzp4z1" } }, { @@ -76395,11 +76947,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20220703, - 2154 + 20230729, + 1543 ], - "commit": "43a30f9578dc2f5acd4fc2941bedaa031b942b81", - "sha256": "0mg2cpinwcfpcg2i70p5fq0s63q1df38z8pjxfrbkgq86fpar219" + "commit": "0ba7d337d8764b4f83788bc6c1f17080aad2b6c7", + "sha256": "1qzx6f8zi36z34nz2ds0yxvfj2m2l9zh0rqpv62l0rv87mpg00yk" }, "stable": { "version": [ @@ -76535,14 +77087,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20230309, - 1204 + 20230728, + 518 ], "deps": [ "cl-lib" ], - "commit": "6956e8e12ee191d7c80d042ae8ff495286fcbe38", - "sha256": "1a52q9nfmc87nz0z8dksmn4wn4wanvdin5xfkir8fmnq9wkdd79i" + "commit": "234806c832994cadedb42596fe235e91bbd59e8c", + "sha256": "1q8325ij1f1y1779f5p00kj3hp3ndqzl5f88f0b238mmz4g4yayi" }, "stable": { "version": [ @@ -76631,16 +77183,15 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20210224, - 710 + 20230713, + 514 ], "deps": [ "dash", - "ht", "s" ], - "commit": "6fcb31f5075edc5fc70c63426b2aef91352ca80f", - "sha256": "1rq2p376016y68w6447sd7h6zgzrxbb3skh7fjw7xfq1p6f19kr4" + "commit": "229e01f0f0a5684499bcc6a11a5bf8dbe14fd4e8", + "sha256": "0b9hr9mika5kcz4d79yyaay2ivmi68vpj0ba5yhkxxzm74yiwmgz" }, "stable": { "version": [ @@ -77063,11 +77614,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20230418, - 1210 + 20230619, + 417 ], - "commit": "5cf1ecaa052d3bdaee93ad5e98bb4f5346404b3f", - "sha256": "1vp5i7rvpjxmdz87yxajp426k0mlpg1pd90m8p2x7ifh50zjqdyq" + "commit": "ae4f53eac2c16024f845faace9f43d9a656489b5", + "sha256": "1y4hagnqpwry2k10zisnr3q6gy97fwl69r369ramx4cl0fd3bn04" } }, { @@ -77596,11 +78147,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20200405, - 123 + 20230720, + 2056 ], - "commit": "9d0bef898f31368cd30e063d53d443dee29683b0", - "sha256": "1jbp8p58bjc0wxs548niv02q9889blnwwfs64h5sm96nzhyzrkn0" + "commit": "eafbc760e32728d2fe2b347621da222537372500", + "sha256": "0a2gznz4054ibwlmis3zb5z63nl663azdn4dml6xks77i6ys73dn" } }, { @@ -77620,11 +78171,10 @@ "stable": { "version": [ 0, - 99, - 2 + 99 ], - "commit": "164e504e25cec1812fbae5c3dae164d9f6018ece", - "sha256": "1m3llm87qgd7sr6ci22nd835vdg0qprs5m9lqcx74k689jl89cni" + "commit": "63e6a3ce7df4abf823ac36a0c52c161d1ec6998e", + "sha256": "04qljly4ir3gsiqa8kayygzhqlc9scrv9pjdbw5haysw6jzzrfll" } }, { @@ -77766,11 +78316,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20230609, - 641 + 20230801, + 747 ], - "commit": "a6999ddd8b85043bb24547611524a7ec86c6a21f", - "sha256": "1h2q3zh156qacdvk4zp5rd4hnqkq9mdm828bz98ra8mdv8nx7m6z" + "commit": "60ed056a72a4a93e75be32d4727be047eb2bce40", + "sha256": "1l5ns4fhqpzxw09x87xbxkvwpmsrldh0735ka432z2pczgnpqn71" } }, { @@ -77799,14 +78349,14 @@ "repo": "rainstormstudio/nerd-icons-dired", "unstable": { "version": [ - 20230511, - 1453 + 20230803, + 1848 ], "deps": [ "nerd-icons" ], - "commit": "87c493858c2b7a4cf0f9a50445adfefd41b2a02d", - "sha256": "0asb0j70h13b0zkxbb74ray9kvv401b6dvmmi7vg3spbii2g7ybs" + "commit": "00038929395a2a10ed5614b59161f29f9e0ffddc", + "sha256": "07y9jlrcnvinwsik1bhq2caiw4wxff9nqicm81b2jimr29ilbjx4" } }, { @@ -77847,15 +78397,15 @@ "repo": "seagle0128/nerd-icons-ivy-rich", "unstable": { "version": [ - 20230510, - 243 + 20230721, + 357 ], "deps": [ "ivy-rich", "nerd-icons" ], - "commit": "664f4cd0bfd9845ef429cb341a713d1a9ded76d6", - "sha256": "193psg005a4q1xcna5j8km64j3mfi92a369mnssh02h17jlwpkid" + "commit": "b3b605efa03d464d6138454ac3f60dcae50e7acb", + "sha256": "10xilnlp9nb1j8h5m413qsf52zi3rvz5ca7wj4zar8j2wmsszdkv" }, "stable": { "version": [ @@ -77906,13 +78456,13 @@ "stable": { "version": [ 2, - 1 + 0 ], "deps": [ "request" ], - "commit": "221d8705eab4b66b1a4fa42655ac38271dc7a6e4", - "sha256": "14cr4r360invcx0a7036gaa1dbrpxvsh1i7885nfkk9iwmnwjwbc" + "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", + "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" } }, { @@ -78087,6 +78637,21 @@ } }, { + "ename": "nezburn-theme", + "commit": "4d9ff9717f25fd229891746044777de8a73558c2", + "sha256": "0nix2w54axxvbzyqi9ivp6r8l9jw20gxnh2wamr8z8bywk15v8jd", + "fetcher": "github", + "repo": "lanjoni/nezburn", + "unstable": { + "version": [ + 20230726, + 600 + ], + "commit": "83ea665941de938350956d62f430de1255a2d36d", + "sha256": "1nhv38afz2dybsa4j8179rv6k56l6ppx453sb7y7frw0jqgf6mvh" + } + }, + { "ename": "ng2-mode", "commit": "a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4", "sha256": "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r", @@ -78172,11 +78737,11 @@ "repo": "nickel-lang/nickel-mode", "unstable": { "version": [ - 20230502, - 841 + 20230707, + 1228 ], - "commit": "4b92668564025b18a3d4da47db51d6360cf9da44", - "sha256": "01mlw1yjypffq8fpvsc9inw6gwrjmb2d944qw5mg51cdldddscc4" + "commit": "8b7828892341bbca789723d487546905ca443dc3", + "sha256": "06327va6dybljw4qvz7p30qndnwl18nblai04y689p8x4a69kgxq" } }, { @@ -78308,11 +78873,11 @@ "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20230525, - 1402 + 20230611, + 1619 ], - "commit": "a5c66339676cb9008aeaf33f827161710e201d81", - "sha256": "1rx4jq621cgm9la4mp2p3mb0nsbrzxahc80h2fmcv9a71486d45m" + "commit": "ae88d2997da80efaaece33ab7f554184ad72d962", + "sha256": "18gya6qkxqxx18rzph5rgkij5asfq88cma6z4yxdbqdgvzf7g9mf" }, "stable": { "version": [ @@ -78621,8 +79186,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20220210, - 1529 + 20230705, + 1229 ], "deps": [ "anaphora", @@ -78630,7 +79195,7 @@ "json-rpc", "rbenv" ], - "commit": "1b7d7bfc99b104b7c4948af9f3394b416105e9d9", + "commit": "d54edbd7cf6b75c5101a961cab54efbafef7d80e", "sha256": "0c38j3drf89f98b6h3xcky6alggszrr86325g72mlbkknszkhh95" } }, @@ -78642,16 +79207,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20230222, - 1441 + 20230705, + 1359 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "bf0ff5d4a079004f937e7440ba282c156f24dced", - "sha256": "129kp12rbggq3hy6w14264svf4a2lf3l5j9mnlf47f35w9zvwxd6" + "commit": "4c13d261bf660901d5ff63a7ee170097ebe464ed", + "sha256": "08z81m25lh1basmq5w8w1sg284dfck3nzlcnv1cbj4fr2qqncvyn" } }, { @@ -78677,8 +79242,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20220423, - 2302 + 20230705, + 1328 ], "deps": [ "anaphora", @@ -78688,8 +79253,8 @@ "s", "virtualenvwrapper" ], - "commit": "8f247dce12bd10de37f0903f3027a1ddbc318eff", - "sha256": "0g4l2d7mji7wl2bzwj1h6p5cyw8w6bw63fcy3kqsgdjny2mkijl5" + "commit": "221963fb0b7116729829145f055ed750d0e2f961", + "sha256": "1sha2sdamq583xaaiqx40vl12ahbsk93ksx7xwp5mmvgsns7wppk" } }, { @@ -78700,16 +79265,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20230323, - 1458 + 20230705, + 1110 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "8189100aa071386665b8616c6b57067383abd47b", - "sha256": "0jvrvin4pwq27p6x693sj6ncjfnqwl9hyjq8l0vf09dr4n8achzj" + "commit": "e27acca9beeb6645dd13545d42f6d4d97d59d82c", + "sha256": "1wz2kszrgi8mljhl8rv3lms7if8vpja7bq4yi89cfyf8yrbm5cz8" } }, { @@ -78753,26 +79318,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20230606, - 1440 + 20230801, + 1005 ], "deps": [ "compat" ], - "commit": "8f3934a965ce66f897593a8400cf426dc20e5bd5", - "sha256": "14casjn118x416vxwhkqy94yajgq8jh1mrd3plnhqs4v47n2yari" + "commit": "fcfd51fbdf08469e6d1b59bc4bd2d75aa708c791", + "sha256": "190lhzqdn4681frk0ih519c3riwxc6mz16q3bisl3l7brsp1rgwj" }, "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "compat" ], - "commit": "ef02b6fcedd97f3ab039b51411fdaab7336d819b", - "sha256": "1i5fcci8fg14hbd4cjb84q3mx6rfwhbwkw0g21v25dal61kw4yvb" + "commit": "1773beeb23c43ce52428957814a2be62532870f8", + "sha256": "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr" } }, { @@ -78798,16 +79363,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20230523, - 606 + 20230718, + 526 ], "deps": [ "kv", "request", "s" ], - "commit": "abb41c504479b293d3ed12379466d1c3b8a7ed2e", - "sha256": "197s8hgcl423c4cmy5c8vcg7rdfkv1ksxq5cdqdh3lk7ll54lby9" + "commit": "0e40721ff97d1311e2b5d392344a961421fa75f0", + "sha256": "0b4bgzpfv7sn9f5hndkfvrz7wsrrfxyh0ga0dbvs82mkk45szvw9" } }, { @@ -78969,6 +79534,24 @@ } }, { + "ename": "noir-mode", + "commit": "c4e55f66f4fde48652bb4117e21468217a4ded89", + "sha256": "02mk13r6hgsn8qb526azsvwm8gdzdiw30zci57yxym6316ppn2p8", + "fetcher": "github", + "repo": "hhamud/noir-mode", + "unstable": { + "version": [ + 20230726, + 2309 + ], + "deps": [ + "rust-mode" + ], + "commit": "aa6686e15a63498af327cc64f1d79e84c60bda42", + "sha256": "0awlk9bfdj0cpfmnh4pjlgbbaadh00rcp41rns69q09nlnmaxsk0" + } + }, + { "ename": "nord-theme", "commit": "34b4c3be2d0d62d8550966067fdb61606cf7c006", "sha256": "1cg1iad4gbzqaiiybk9f56s3y54n48b58p95nafa7w6hndx40d60", @@ -79000,20 +79583,20 @@ "url": "https://git.sr.ht/~ashton314/nordic-night", "unstable": { "version": [ - 20230605, - 2045 + 20230727, + 1928 ], - "commit": "e935956392bc78cf895eaa5df9f4c8f5da76dc8d", - "sha256": "19njr75b099snyvzalrvzxi738z1f8snll2bj421bg70yjg9v40a" + "commit": "ae953b9c4046901e269dedcb62276c035efc2098", + "sha256": "0q0j52fw2lk0az993f40l9sx50bmhzp9bag76avglkcm4kgbxmgm" }, "stable": { "version": [ 1, - 0, - 5 + 1, + 0 ], - "commit": "8b4abb2b8c17eae24e72e79e8db56e20b66a3554", - "sha256": "15k9pyll6ns9wl6ibmbsh9s929hxr6sw24sdgm4c2ikxlyddzdrx" + "commit": "424a6eee0c3e1d18dacc60e4ae341d0816d95a49", + "sha256": "0qsdf06p49r2lavl7pvgaxb2233f3ikzap1f8ir5fhpcj5gyi0ps" } }, { @@ -79053,8 +79636,8 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220821, - 1614 + 20230715, + 858 ], "deps": [ "dash", @@ -79063,8 +79646,8 @@ "s", "websocket" ], - "commit": "387c7ae65383f7e9ff7ae93250ef6cf0e2b1b71a", - "sha256": "1wvypfhr9h077yq5sdszfnnhvgin6wciv5fmfa55w0fd6vzg72w4" + "commit": "1a342900d70b306578f6e1ab8daabc62a8a610fd", + "sha256": "1z84g5wy38zsimkw485l33vd75b602w42v9hm7irjrcnspwpyspq" } }, { @@ -79175,26 +79758,27 @@ "repo": "publicimageltd/notmuch-bookmarks", "unstable": { "version": [ - 20200322, - 1925 + 20230727, + 1504 ], "deps": [ "notmuch", "seq" ], - "commit": "37a0a46bc68f4b2fe0d456c24f22a703171eb0f8", - "sha256": "0431lw1r4kbfxry3p0gv41qd3z860aiayvfcpk2jx9q0isrr879c" + "commit": "7c053fd2d278dc3a9f07f86975867bfbb4e7448d", + "sha256": "1azg565r94h7qaxsv5qsc2x11clhsvlb49ssn06ashh2my9xxxj7" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ + "notmuch", "seq" ], - "commit": "c0071310f01dd5296600bdc4d6135667d38ef0de", - "sha256": "0zg53b77g4s05dj3a7n3vxdvfwya6pzc0v86kqk0443m2y96vfwc" + "commit": "7c053fd2d278dc3a9f07f86975867bfbb4e7448d", + "sha256": "1azg565r94h7qaxsv5qsc2x11clhsvlb49ssn06ashh2my9xxxj7" } }, { @@ -79300,14 +79884,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20230421, - 1548 + 20230715, + 1434 ], "deps": [ "esxml" ], - "commit": "58c35e677e11f5c04a702b42ac753c80c8955089", - "sha256": "1vzgbhfd2pz4khamgifhbfz7094kp9nf00d1v1d0smzdw4wgzawj" + "commit": "cc31ce0356226c3a2128119b08de6107e38fdd17", + "sha256": "0k09dd0j8m8607dv61qm4q1jk9hvn39sxzk5ckcalafjanp7l0r6" }, "stable": { "version": [ @@ -79497,11 +80081,11 @@ "repo": "mattfidler/nsis-mode", "unstable": { "version": [ - 20230605, - 1652 + 20230619, + 1220 ], - "commit": "a3bc65b373d74acfad8eb4ef8072fd7059b6ace9", - "sha256": "1k4ciy2nf3w9z43fh40zgp7vlyb54acamq3837v8z21gxx3xgk5x" + "commit": "b5ae66dbab9b2d933a234bdcd28e017d44a1276f", + "sha256": "0vq2sm593ib44bqcgnmn99zbvq89v3r2znw9fdybp95a948xk105" }, "stable": { "version": [ @@ -79673,27 +80257,42 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20230320, - 1439 + 20230725, + 212 ], "deps": [ "dash", "s" ], - "commit": "f9ec92558a2ac293ab9a2f0611624b6c7d2d5658", - "sha256": "16ncaxjv2zzpbjsvld7rg8s2ayajkarsf32rv6hs8sbzpmk3mdja" + "commit": "5cb26db4f6b63a588ad7b8d2ec22ebf0f56f1076", + "sha256": "1ld5m75mmfb7kp18sww5blvlazk0j1j0yhdkhsx1m624dq5rag1c" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "dash", "s" ], - "commit": "f9ec92558a2ac293ab9a2f0611624b6c7d2d5658", - "sha256": "16ncaxjv2zzpbjsvld7rg8s2ayajkarsf32rv6hs8sbzpmk3mdja" + "commit": "5cb26db4f6b63a588ad7b8d2ec22ebf0f56f1076", + "sha256": "1ld5m75mmfb7kp18sww5blvlazk0j1j0yhdkhsx1m624dq5rag1c" + } + }, + { + "ename": "nushell-mode", + "commit": "4632c92ee8d06ac61d169a9ffadf69fdfde37599", + "sha256": "1wvm6vwnk12q3h7ibaf7077vx4rigj4h9i91kabv9ss0859n7b1f", + "fetcher": "github", + "repo": "mrkkrp/nushell-mode", + "unstable": { + "version": [ + 20230612, + 726 + ], + "commit": "ff8f8013af3076c041bd5235a54776890f4c4d0e", + "sha256": "1m06flbry3yi3n6ad3lllvwj8w03ahpbkj5nv1k1y88cgbp13j85" } }, { @@ -79808,14 +80407,11 @@ "repo": "fvdbeek/emacs-oauth", "unstable": { "version": [ - 20230522, - 1900 - ], - "deps": [ - "hmac" + 20230706, + 2026 ], - "commit": "78f4f8539c72eda6cb2187c1efbb9e857e013be5", - "sha256": "1zcl7pz1mwq7n9ky7qvhbgr2ql5z8fsg092507wq2p60f60c6h5h" + "commit": "737f4058b3239261cf7c95043034b95f1ce3b282", + "sha256": "05xfpgk4swss89n3wrk0cg87ngsv06szpam7svncf4c2gjs9gkxa" } }, { @@ -80013,14 +80609,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230531, - 732 + 20230708, + 1957 ], "deps": [ "chatgpt-shell" ], - "commit": "4e117234f07991a1f1d100be84fbf2f4689ae39d", - "sha256": "1l236pcawp030gcmbbb0hi3blncn9h59az7j9d2s5zgpicza2x78" + "commit": "345f9d0e9047091474a2cea3d12b6e52b804ae36", + "sha256": "1izsmc5h3na3wz7vgppid3l65y8xm8wcr9rskmxg8pdcbi7q3qb5" } }, { @@ -80096,6 +80692,14 @@ ], "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", + "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" } }, { @@ -80166,14 +80770,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230531, - 732 + 20230708, + 1957 ], "deps": [ "dall-e-shell" ], - "commit": "4e117234f07991a1f1d100be84fbf2f4689ae39d", - "sha256": "1l236pcawp030gcmbbb0hi3blncn9h59az7j9d2s5zgpicza2x78" + "commit": "345f9d0e9047091474a2cea3d12b6e52b804ae36", + "sha256": "1izsmc5h3na3wz7vgppid3l65y8xm8wcr9rskmxg8pdcbi7q3qb5" } }, { @@ -80637,6 +81241,25 @@ } }, { + "ename": "ob-lesim", + "commit": "d36c6b3b5afd279b6cd5a960a1535990b2a42e32", + "sha256": "0d5cchpl8dfij1b7hvlcy12wrg6s8cvcmysyb8nwyb1v2xaqfl3r", + "fetcher": "github", + "repo": "drghirlanda/ob-lesim", + "unstable": { + "version": [ + 20230619, + 357 + ], + "deps": [ + "lesim-mode", + "org" + ], + "commit": "37e15f610783ff12926b5d221cefb4a49b4d54d6", + "sha256": "0kw4w4x2sd803zg7pg7i0sbj3fc43rdvrgi4mjkrfmg9z35j862x" + } + }, + { "ename": "ob-lfe", "commit": "d595d3b93e6b25ece1cdffc9d1502e8a868eb538", "sha256": "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8", @@ -80794,11 +81417,11 @@ "repo": "alejandrogallo/ob-p5js", "unstable": { "version": [ - 20230103, - 1356 + 20230802, + 1613 ], - "commit": "c9f89c8b588cdb0c021a875b8f9fc91be7e39de8", - "sha256": "0rs8c4dlxawm4sclgrc2bi6z43dhalbac91hgxa7kw6vssfgibbp" + "commit": "6a1684a02f5baf6c433bfaf700b8c33b0f6ff12e", + "sha256": "14ks9hc6740jqx9q3rxva794r604lf2qjkqv4vag3adxan78d55a" } }, { @@ -81074,19 +81697,6 @@ ], "commit": "4d3ab60c2012aba2a5bd96a4d42dfeea0be6edac", "sha256": "1q0ssiggaknc9hd7hyh8hi57sc0vm7k4lnj3yjxjvi0m4akv0qa5" - }, - "stable": { - "version": [ - 0, - 4, - 2 - ], - "deps": [ - "org", - "spice-mode" - ], - "commit": "790faa67b0c57ca76e8814a1fa60b4dd774412c0", - "sha256": "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d" } }, { @@ -81383,8 +81993,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20230420, - 1111 + 20230722, + 632 ], "deps": [ "dash", @@ -81393,14 +82003,14 @@ "s", "yaml" ], - "commit": "1214758b99037884c4c062e6d298b417200444cd", - "sha256": "0idxgfk2hcgnbjg31lvn1s2glfj1xy0calb8s3k32znnsyjz4kyb" + "commit": "907e38cfe1f4c781b66d156862ac26cdb9c1cff0", + "sha256": "1xkc7ax2v6m5xr1912k0xb2fv7xy119nzhl570l8nlrz5ggqv5xd" }, "stable": { "version": [ 1, - 1, - 11 + 3, + 2 ], "deps": [ "dash", @@ -81409,8 +82019,8 @@ "s", "yaml" ], - "commit": "1214758b99037884c4c062e6d298b417200444cd", - "sha256": "0idxgfk2hcgnbjg31lvn1s2glfj1xy0calb8s3k32znnsyjz4kyb" + "commit": "907e38cfe1f4c781b66d156862ac26cdb9c1cff0", + "sha256": "1xkc7ax2v6m5xr1912k0xb2fv7xy119nzhl570l8nlrz5ggqv5xd" } }, { @@ -81436,20 +82046,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20230420, - 1458 + 20230718, + 1531 ], - "commit": "ee9cdd7e19298dc025d77212cab11b3d97b9972f", - "sha256": "1wzb6p3kjzjv1dszvsyw7xhdc4g8pzj16yvxah2aiwwdwqqiywnk" + "commit": "fe70498a8982bef951311b37aa8568218ce8801a", + "sha256": "1gzc6zi4czn069fm7vf27lpcx09qh1ndj17g08gywkcmwf66rdrg" }, "stable": { "version": [ 0, - 25, - 1 + 26, + 0 ], - "commit": "651f767b48e14ba6b24db9421306942d9e51adcc", - "sha256": "00jfipp5ibz6yp5ismwnhq0gqlgwnsb2i4k2i64h9drq30pdcdzz" + "commit": "fe70498a8982bef951311b37aa8568218ce8801a", + "sha256": "1gzc6zi4czn069fm7vf27lpcx09qh1ndj17g08gywkcmwf66rdrg" } }, { @@ -81498,6 +82108,24 @@ } }, { + "ename": "occurx-mode", + "commit": "15245d094ecbb0019b1e7adbdbe8cefbbd43e81b", + "sha256": "11hrbhmy35ivxrjm0lc7i7krizwkb6ff6ccjaajh1pmib4mfrn1h", + "fetcher": "github", + "repo": "k32/occurx-mode", + "unstable": { + "version": [ + 20230605, + 1357 + ], + "deps": [ + "rbit" + ], + "commit": "e17c67b3701339270b3428172cce0ea237810e5f", + "sha256": "1i9gpzphr5iy4q82mln4amh7i0hds49z8j9v1zari4nrpc7r897j" + } + }, + { "ename": "oceanic-theme", "commit": "b9d85588df4e2057ef1c822ff177572054ed979b", "sha256": "1i69dy9hfqwfyiykvnqzkqim0lv1p5z5fjsdk84068si4b029gzv", @@ -81809,11 +82437,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20230515, - 523 + 20230729, + 403 ], - "commit": "fbac9e530967cddc7be846c849e2742a64f4f6d3", - "sha256": "13wxk4lzyvcq4fmkxkikb1j1zg6gmqa5wzaz14ms42pf2i8kbvmz" + "commit": "a644ee9d24c7283435ce42e11498951e100608c9", + "sha256": "1c65bi13v2liqglzh4kx9wf53m0cnw1xygxcl3hpv9s9w6fbpnn4" }, "stable": { "version": [ @@ -82169,11 +82797,19 @@ "repo": "ProofGeneral/opam-switch-mode", "unstable": { "version": [ - 20221109, - 2306 + 20230802, + 917 + ], + "commit": "1069e56a662f23ea09d4e05611bdedeb99257012", + "sha256": "1nqw4qjqdklgnl4pj6n95miyhvcmhs36d37yqd65dkyjc5s6dd1z" + }, + "stable": { + "version": [ + 1, + 7 ], - "commit": "dea35145a39b80b7d1df217395928d76abab0b13", - "sha256": "196x7nk7669xpcadl7dcs2mjqc9b5sml2kpqsb3dqw5b5rww82ih" + "commit": "71612b9a307c640d2fa662b266787647a3a5075a", + "sha256": "1d7rl0v8vp7wxxrlmkrs360jr36yivjmcvawqxkfrj20zpjy88h2" } }, { @@ -82358,11 +82994,20 @@ "repo": "danielfleischer/opensub", "unstable": { "version": [ - 20230417, - 1635 + 20230716, + 1018 ], - "commit": "0faef3dad6fc9c0eda1db1b237e6f66a8f411b01", - "sha256": "0b6cgq9ds12pf88z9rwcyjqi5ajlwhhjw3qwkybs7jx0n1x3q78c" + "commit": "216f60baf8cfd527fd84676b7389f463a04ae80c", + "sha256": "1hgkpkcgy342wyzdvnb0lb9vpr6fsym42ahgmmnq63ijw5r5kiq5" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "216f60baf8cfd527fd84676b7389f463a04ae80c", + "sha256": "1hgkpkcgy342wyzdvnb0lb9vpr6fsym42ahgmmnq63ijw5r5kiq5" } }, { @@ -82460,11 +83105,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20230219, - 1648 + 20230802, + 218 ], - "commit": "e6784026717a8a6a7dcd0bf31fd3414f148c542e", - "sha256": "0rd6ajsjqjbfkxnbfnbpacwwwka5z49l2am54rpk0w49jk8gsidm" + "commit": "6936fe46ef07df168a423f04efeda130b4e69753", + "sha256": "0irmid327qanjgp7x80zc1cm1v0ib6g1kli4kbm4gnfsq2fkybd9" }, "stable": { "version": [ @@ -82565,20 +83210,20 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20230607, - 2341 + 20230803, + 2124 ], - "commit": "dbaa931e7cf39097716f4a3502a179b350f6bc9d", - "sha256": "1g5ssvngxrrdhj2ckjmnc6qx2h4jzhkflnxjzhd4qv3c1ifdiz2f" + "commit": "be19a2cefca360629eeb61e3cea0dc60e55cf897", + "sha256": "104ihjbnlx6pjc8sslp4bmqpq4p5syzqf50lsn9a4n9r7bmfd4k4" }, "stable": { "version": [ 0, 3, - 8 + 11 ], - "commit": "dbaa931e7cf39097716f4a3502a179b350f6bc9d", - "sha256": "1g5ssvngxrrdhj2ckjmnc6qx2h4jzhkflnxjzhd4qv3c1ifdiz2f" + "commit": "be19a2cefca360629eeb61e3cea0dc60e55cf897", + "sha256": "104ihjbnlx6pjc8sslp4bmqpq4p5syzqf50lsn9a4n9r7bmfd4k4" } }, { @@ -82645,30 +83290,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20230117, - 727 + 20230804, + 1244 ], "deps": [ "dash", "promise", "request" ], - "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", - "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" + "commit": "1bc1bc1a6f06d0d9fe3ac3b8a86e061b80a32462", + "sha256": "1jh11mbjswfzqhx7vff0lq07ggdfv8yjzqapkkbj8zfvp8p3v406" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 2 ], "deps": [ "dash", "promise", "request" ], - "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", - "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" + "commit": "1bc1bc1a6f06d0d9fe3ac3b8a86e061b80a32462", + "sha256": "1jh11mbjswfzqhx7vff0lq07ggdfv8yjzqapkkbj8zfvp8p3v406" } }, { @@ -82724,8 +83369,8 @@ "repo": "tyler-dodge/org-assistant", "unstable": { "version": [ - 20230611, - 544 + 20230623, + 1439 ], "deps": [ "dash", @@ -82734,8 +83379,8 @@ "s", "uuidgen" ], - "commit": "85977c9894437d0a3e6ed4afb2baa1534e1ddc22", - "sha256": "14yi94x4zdgk5g69m6czpagkh8j2dff21vxgirxknr297rncypjz" + "commit": "d036f82072e22a7fc985e94853deaf65c41d5967", + "sha256": "1dggs5w831jlxbn7v5wn755ggg2kgcsij4js19m9yiz6wnw5nrxk" }, "stable": { "version": [ @@ -83027,19 +83672,19 @@ "repo": "pondersson/org-bulletproof", "unstable": { "version": [ - 20230603, - 1314 + 20230615, + 640 ], - "commit": "a81c275e2e9d43ba98465df8b41adfd398184fda", - "sha256": "06ls8m6x7ijyq7hrrz1hw78k5w9nyybsj7dkwax8janrvyj5qnw8" + "commit": "8ae80a53f8034914f502a8655f420c55078e02e1", + "sha256": "1429g8s9p4d2chgsyx5dzdwk428h64zbjmswcv4p67jngy5qk2fr" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "a81c275e2e9d43ba98465df8b41adfd398184fda", - "sha256": "06ls8m6x7ijyq7hrrz1hw78k5w9nyybsj7dkwax8janrvyj5qnw8" + "commit": "c9d09ff91a8d637ad8c2975bc39288a0e26c98ec", + "sha256": "1zahdc38hzf841n7qvldnjlr78nq2p1rqbq2f0hcabnps4hg9v73" } }, { @@ -83074,14 +83719,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20230421, - 1620 + 20230708, + 134 ], "deps": [ "org" ], - "commit": "1efb8affe65e70cb2a5437014df3bc8a29922e9f", - "sha256": "1mwcpqiw1myd7lv5fxww2a1lz8s88z4aywa6m1drqr8rhbbyxydl" + "commit": "f6bf3c402918d0a5f958a7d18e86ad9df2e4a9bc", + "sha256": "0n7l7hicvfy9zh0rybpc1pasz5jld8k5vbpigwyc2vrga7nvs2na" } }, { @@ -83329,14 +83974,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20230227, - 1417 + 20230721, + 151 ], "deps": [ "org" ], - "commit": "ae45b9413e24abdc431d12858dced54e0dee6e39", - "sha256": "0dgw33db262pbm58l8z04bkh3jk21ddzziiblkbxzm736g6ckivq" + "commit": "7f03eafaad2e5746949c0bebb98353e939c51ade", + "sha256": "1s29h8chfskls13jb13j56cvzfyc4xgg4ckv97a6wy902lw83z8b" } }, { @@ -83395,16 +84040,16 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20210212, - 142 + 20230616, + 754 ], "deps": [ "dash", "s", "seq" ], - "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", - "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" + "commit": "5993e2b83831c1937eb70ef23629008218210d22", + "sha256": "131p7641n8v237nwvs84agvfl1h5nz53smq89k6fpl3ifkkicl6f" }, "stable": { "version": [ @@ -83749,15 +84394,15 @@ "repo": "jagrg/org-emms", "unstable": { "version": [ - 20230515, - 1838 + 20230626, + 1102 ], "deps": [ "emms", "org" ], - "commit": "3a4073565e88d6b17348a533a9ebd88941fb3da8", - "sha256": "1wg7sf8ys8js3f90xc4qgcyq7rzc2aqxc2wj7vwrfvlyi2ps86km" + "commit": "13c8f245885a7f4f87bf88c5ad5612af03be1e77", + "sha256": "0aff2a65crc2w9gsah9wv2i28ryx1dvzxkcfhwj18psnanba90xi" } }, { @@ -83987,8 +84632,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20230531, - 100 + 20230718, + 54 ], "deps": [ "f", @@ -83997,8 +84642,8 @@ "org-edna", "transient" ], - "commit": "60855bf9bb7359ccb45fffe86cd1664b46991b6c", - "sha256": "1cmc6r3aj9v97y081lmc9cqfgdf543z2vh11b1b7k5nim6gb2yi1" + "commit": "4f50c27d1afe90cf764cd10cecf91a085694c8bd", + "sha256": "1i6m7fzrjmd33hhcnjcqw0h8acjijndgy3qb9yz3gfybpv6nhzfl" }, "stable": { "version": [ @@ -84071,15 +84716,15 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20230310, - 1639 + 20230803, + 1640 ], "deps": [ "dash", "org" ], - "commit": "73d3f750d236dd486b8bcc07c88bfda9ce5b384e", - "sha256": "0javg4ivljfdcppzr6x38jf94g5hm8zibfy8cmjlnjmc1wvv9s0y" + "commit": "588acb063f1c73025f973cbbba64a9f65a737bdd", + "sha256": "0zbynga4az8kh3iw3r7pz39mvi55vk2y19z8f13027sq2vff7rla" }, "stable": { "version": [ @@ -84160,16 +84805,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20230103, - 1720 + 20230803, + 1629 ], "deps": [ "dash", "org", "s" ], - "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", - "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" + "commit": "1bf6e8d540774da3880d7c8e78eee15805409470", + "sha256": "07gk84dn8cy4bpq2xzsq45879xb40h6km150pz0j83cblx9047jz" }, "stable": { "version": [ @@ -84194,14 +84839,14 @@ "repo": "shg/org-inline-anim.el", "unstable": { "version": [ - 20230331, - 1048 + 20230610, + 1504 ], "deps": [ "org" ], - "commit": "9316fe78319fa18c7282993bd547cd33fda1b8ee", - "sha256": "1513rdzbdl6f1gdf5xf65514361ni2jjcbmygsk4l16hnbdbzdhl" + "commit": "488fed644748b578dffe7e3847970ec25dcfd24d", + "sha256": "0ksif4ngwizdwd7sjw2rsgq69cbrrzkvbrn57qb2l3l21p5irh7f" }, "stable": { "version": [ @@ -84389,16 +85034,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20230105, - 1937 + 20230704, + 2026 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "dfb3b2d583ceb7ad9fbc8ac23ab6316ae172e9fb", - "sha256": "0nfk2kb0jii0v51al115n9i13dp6mw2964d2plgbxdd7yqwhwkrj" + "commit": "f6433d0810f87a80847f4f3674db4ac89a59c69c", + "sha256": "1x9pa6n67sba8wjgcysg5w4fkszr9h3wyj0a8w3zx3icfs675r6a" }, "stable": { "version": [ @@ -84497,15 +85142,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230524, - 1244 + 20230806, + 817 ], "deps": [ "fb2-reader", "nerd-icons" ], - "commit": "003e0967d85f9589bc828cf044c149fd59b45d2e", - "sha256": "1g01gkxxpc9428fq2wnnrnsrxpq442x5xg24jp1wih2d6296q4li" + "commit": "9c6d4c832419d91d0ab2fc5395239d33cc47f2ec", + "sha256": "0iswjq8q6lf07v3r0xsb01z2wll6vz3879jq4r4qgcil023n239x" } }, { @@ -84745,25 +85390,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20230604, - 1002 + 20230702, + 805 ], "deps": [ "compat" ], - "commit": "7a3a8c3991f0c8dbe0d85cf66c35a4ff375adc08", - "sha256": "13yzn0w2ahz201z8m66663kdarmv157qalccpqix0c9qqr66x2xn" + "commit": "63372bda43a9d0dd9940c1ec3c53f752b642ac41", + "sha256": "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "compat" ], - "commit": "b614ad31d72c49f9eb29d3836995fd7fb0d1fd4a", - "sha256": "16c74vff882rx8yp4ybaydlg5774xz68iasajhidbn0fb4fhz8ph" + "commit": "63372bda43a9d0dd9940c1ec3c53f752b642ac41", + "sha256": "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c" } }, { @@ -84805,14 +85450,14 @@ "repo": "bpanthi977/org-mpv-notes", "unstable": { "version": [ - 20230414, - 500 + 20230709, + 628 ], "deps": [ "mpv" ], - "commit": "215bd0fdbb8593e555231309dd11a96af7e98a33", - "sha256": "16dgs8nzh234fds8b15fba9f2bdgwyv986fgp5f6fhqzibpr3536" + "commit": "e068fad0411a9213233059e3fbb39be2bfb941f4", + "sha256": "0416wp2xchji628id5czg3prp8pz11j40p17nkn3bgpvnhxgw9dr" } }, { @@ -84823,11 +85468,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20230104, - 1922 + 20230704, + 850 ], - "commit": "be90bc9084b384d8a728d68f69da09171ca26d3c", - "sha256": "0ssbfq12g85i41p5wp84ii6wd10sjhf96fcvdn16g3vvi2nj8f2h" + "commit": "66fe744df9100efc4ec68089f7d0ce56a0d38b8b", + "sha256": "03xb95qxsr86xv3g0x36dlrm5sidd9fhnfxawjiqkj02bpp9by1n" }, "stable": { "version": [ @@ -84939,28 +85584,15 @@ "repo": "org-noter/org-noter", "unstable": { "version": [ - 20230605, - 323 - ], - "deps": [ - "cl-lib", - "org" - ], - "commit": "1fbf59833e4792e88645bffdcab387b77fda719f", - "sha256": "1bqqpz5zj86f0j0lc41ypyyyp14w57fxkx0lvpn1j3qhy9hym4hx" - }, - "stable": { - "version": [ - 1, - 4, - 1 + 20230728, + 2037 ], "deps": [ "cl-lib", "org" ], - "commit": "32900872c82195e757ec6249a329490a0ca2199e", - "sha256": "1vwfpdi7hfkxx4vi0cwg7rvqby3i0mymzdkyzrqzv30dazmcjpag" + "commit": "4d47516e0fadd31b03350241a6fb23e108bfd65e", + "sha256": "1fdh7msc8jxgg8jqqh17xg5n0aa9lvk0n6696nqqxixsgg33k6lr" } }, { @@ -84971,8 +85603,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20220320, - 300 + 20230725, + 1433 ], "deps": [ "org", @@ -84980,8 +85612,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "c88130c90aac5a4759849df86fb1829db183bed4", - "sha256": "174r9nfazgnzqwvw06z10l1d82ysnvkfixgz9jy5wlkx6ynrrnpb" + "commit": "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac", + "sha256": "0n8apjqlm7rs66l635szvsvc4qn8m147g07rgkd30a4v4m24mj8x" } }, { @@ -85323,8 +85955,8 @@ "repo": "IvanMalison/org-projectile", "unstable": { "version": [ - 20220114, - 730 + 20230802, + 2300 ], "deps": [ "dash", @@ -85332,8 +85964,8 @@ "projectile", "s" ], - "commit": "bc5a2401b456c42c4346d59fa77d633770b6efea", - "sha256": "11x7v60cx9i03q20d3chgdqlvlx1k3m68zkrghkcf7jxdhxv7259" + "commit": "b2a6ab28acef4a70d0305c29df41f682c4144533", + "sha256": "0dkvz2p420ffiy7mmx21nfwc8x324fh6hyirdhg1m19zi7rjagvb" }, "stable": { "version": [ @@ -85726,8 +86358,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20230518, - 2125 + 20230613, + 1849 ], "deps": [ "avy", @@ -85742,8 +86374,8 @@ "parsebib", "s" ], - "commit": "cb624ec1c1a351037a59071342af31bb38b3b4fe", - "sha256": "1v3w6a0vvdjgbp5ik9d4q8d7fz177q8pnzjfs3706lrr9gvk2zpv" + "commit": "26c06912c7833104c7b4c7b96b8f200e98067a68", + "sha256": "1mqpcp16jbyhl1jxrxr4k00k93mfvbp54y8hwf67zyv21a1g2sj2" }, "stable": { "version": [ @@ -85927,15 +86559,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20230201, - 1834 + 20230628, + 2036 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "c87acc2d5685ba2608e2bd1f128e723f1de9d837", - "sha256": "15a9b8b7xqrjyqbddqb05b1fqf2xcwxqfj9hfjvkqzk9rwgz3sir" + "commit": "f90ac12b7ae5ba7bcdebfe53796fd0417946e5e1", + "sha256": "0magzl7bffwvjmri7r4smp6wdjcn8wgfgrd9sk5z0kcydd0r4aab" }, "stable": { "version": [ @@ -86178,8 +86810,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20220326, - 1432 + 20230721, + 43 ], "deps": [ "dad-joke", @@ -86190,8 +86822,8 @@ "s", "seq" ], - "commit": "2e397dac372ff75ea6ee6eed9ae3a0540a082af8", - "sha256": "0i838ph9p92vfirf6q145m22nydzrans2ss6aj80m4g0b2mprq2z" + "commit": "d7bdf9fcfe28f96f9470719f3985a6e413592de8", + "sha256": "060sfkh05fnrk8sfciszggxmyxyp7851i5zx4w9j2ki7kw8rfp2b" }, "stable": { "version": [ @@ -86313,11 +86945,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20230204, - 1000 + 20230625, + 721 ], - "commit": "99ee0c8261267a89708e3a9dd0e0d865e894f96e", - "sha256": "00xcyarsg2pmsr1085yrq75s7n7llc2dinzy8qlgw1xxkxb2b55r" + "commit": "eebf509c3acbda760faa7fd12b2e8902ae09482f", + "sha256": "08rkpknan34wdzh9wlsgvnfxlrjrc66jrl22i22hwgxzia9mzpyi" }, "stable": { "version": [ @@ -86553,15 +87185,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20230610, - 1559 + 20230721, + 203 ], "deps": [ - "nerd-icons", - "org-pretty-tags" + "nerd-icons" ], - "commit": "569d2fe6548bebd4171c8410cdb104c0321918be", - "sha256": "0j3ypzqyxma0yl1w9y1qsx7pl2yzgvv4xsrj6bpdz76k85f5ixg7" + "commit": "4805dd105eca312c8ef6033bd57d356b37063ace", + "sha256": "1acjsnvj47gf1rnm5xzck7h817p9zipi0xqywcr10v15mqwk6p8b" } }, { @@ -86683,14 +87314,14 @@ "repo": "jxq0/org-tidy", "unstable": { "version": [ - 20230404, - 1119 + 20230724, + 46 ], "deps": [ "dash" ], - "commit": "2acf3f9b132bed43ae1c869140bdcc4d2fb7e0eb", - "sha256": "1x6pkhr4isyw3b0gzpdjya09m2wizrllyzzk5ki7zgjlqkzcpb94" + "commit": "c89b0279833c07e5276a8c7009a41e9085b5e9b4", + "sha256": "0g41fr3xvybyxgkwhzwwqik4z1g2cnyv5blc5hhxjnrr4v5qc4xd" } }, { @@ -87006,6 +87637,38 @@ } }, { + "ename": "org-upcoming-modeline", + "commit": "bfd9f417494ea7bd1997636f50af588685c75743", + "sha256": "003i2fffc4ihmw9rgrwm7vmb4pkd4aswkkdq85vnjgrxn0d3b30z", + "fetcher": "github", + "repo": "unhammer/org-upcoming-modeline", + "unstable": { + "version": [ + 20230707, + 847 + ], + "deps": [ + "org-ql", + "ts" + ], + "commit": "c3e4705ff2ade869e229f33090c92ac671362623", + "sha256": "1kib6c9426qkfrmhnhqw47r5y9z082xjw1qvbhqwrip69mi06yd7" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "org-ql", + "ts" + ], + "commit": "51a45167e826944a3f01d1142714de62a050daed", + "sha256": "0m40firrm377zblc2hsdn2m12y0hbv37cznd6xxrps20mqfcnpcn" + } + }, + { "ename": "org-variable-pitch", "commit": "9632b7e98772b584d6420f8d0f9652d67118e05e", "sha256": "1xci5zq1bpwnm3adlcsxzpskxywzalb1n3n14lvf787f77ib602c", @@ -87179,16 +87842,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20220414, - 1402 + 20230803, + 1640 ], "deps": [ "dash", "org", "s" ], - "commit": "6af54ed3a5d9bf90629223157803c42f5d3b152c", - "sha256": "1jpiyjzvqqzrnp95vysp7b742pxlfqd1g6srxhv3fjlq65px6z5a" + "commit": "c83a63f34829dca137941bc06e29c34bf056a43b", + "sha256": "1vz2f2f37gz2jbybidh0s6zl331sa2qw0nrw500ignd2hjcf30pr" }, "stable": { "version": [ @@ -87235,26 +87898,26 @@ "repo": "ymherklotz/org-zettelkasten", "unstable": { "version": [ - 20230526, - 1650 + 20230613, + 1924 ], "deps": [ "org" ], - "commit": "44e13ec043ad726f6a16ea36bfb43d985912e746", - "sha256": "03vrlwxigh0pagwcdz6g0pr031kyjhzkg09s97rybphqinbnznrc" + "commit": "5863a057f9b41dfa4cbf383c325b3fcddbbe5449", + "sha256": "1ibwcwn47pgf6dpqz71cm6azwdngb3blkwclii0y876fmyqhywsw" }, "stable": { "version": [ 0, - 8, + 7, 0 ], "deps": [ "org" ], - "commit": "44e13ec043ad726f6a16ea36bfb43d985912e746", - "sha256": "03vrlwxigh0pagwcdz6g0pr031kyjhzkg09s97rybphqinbnznrc" + "commit": "e8a4d435e1d33344a1be192b6816a67394d91307", + "sha256": "0rx3sv3hg5f9b18nr3yiqd5zbmf778qa0fm2l5nzsgb4zlrhm6vp" } }, { @@ -87705,11 +88368,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20230205, - 836 + 20230806, + 1657 ], - "commit": "4f9fcb4f7380b247d628b899135df23c8fc8b6f1", - "sha256": "1b17c8g3x5k94yn76cl1h40hf9hka3w3cfjyybmcnrm92mg8g1cw" + "commit": "7e158316ab43c92f6f41597e8646715870049abc", + "sha256": "07bs01ifdqixp725rwrkwb78777979dv4mcf4jh6qidhdaqf8zq3" } }, { @@ -87913,25 +88576,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20230518, - 1534 + 20230703, + 1828 ], "deps": [ "compat" ], - "commit": "6df17a6a84a242e3a9a45a0677fe6a0fc42657c2", - "sha256": "00a9ndblkxs7cisr3zkqivzwz7fcd4yd41nlm5gg00qk4gs7jzg5" + "commit": "75a7ede98a3df8d99e861ddd14765d3b3da1fdb9", + "sha256": "0a2xizwg9mhnyxsr6p799cxj896a6zf8cpxfxl3v3b9a5ry776nn" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "compat" ], - "commit": "f08f03860021fa334708829d705370614e383880", - "sha256": "1wfk8r0szav8hipq0apaix2f83kmxcrmgvykb30acgap9rjs357b" + "commit": "b2481ef66d4443402bfbac66cbbfe51a52152407", + "sha256": "0i1lks8724i2nz9jk5csl4nfkyi49fc928a117sn7438z82r9gyr" } }, { @@ -88690,11 +89353,11 @@ "repo": "jakob/ox-haunt", "unstable": { "version": [ - 20220615, - 7 + 20230725, + 1 ], - "commit": "d32c4b1ab258dc34ca7e713152a274eab35d2608", - "sha256": "1h5g32kw3dgdp3vdzx34n8pcmg3ssn2bzmx5an7yksymibmayfjs" + "commit": "1c8c70e3173f98206768c15cb2e4de706559f151", + "sha256": "1vqbn70y9zmr1542mm67m3hwb11pib8ndn8nxjbk72zrqm9br19r" }, "stable": { "version": [ @@ -88928,11 +89591,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20230505, - 644 + 20230611, + 1229 ], - "commit": "2e22e72cf886db104b6a31172736f073bf743eb4", - "sha256": "1r2i4scyqzrya2qswlb5ayrsfhwvijl7p4nqc9d1rgxpdikamqz3" + "commit": "535f7228a845b69a9f70d81b30d304a2bf01cd3d", + "sha256": "15r140ivf5y593xv16yvf9hqp005fvka7wyfikk7s5baalali39i" }, "stable": { "version": [ @@ -89023,16 +89686,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20230128, - 1219 + 20230627, + 643 ], "deps": [ "dash", "ht", "org" ], - "commit": "66c32cca4f6047dd7e0f77f10bd565a2d83d4729", - "sha256": "0ciihyhmn32kl2iicr90xrzx5nrlcqniq38qpxq0vj6kxwm2gxg3" + "commit": "0f758517f512e375825679541b5d905be40342eb", + "sha256": "0snq2mkxw7inkrny5dnqknq2i8kz6cyr73w2fnl46r9zxj59ykz0" }, "stable": { "version": [ @@ -89093,14 +89756,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20220910, - 951 + 20230712, + 1639 ], "deps": [ "org-msg" ], - "commit": "029fac8d4c83cc8841ade0dfebc8b7d7508efbb2", - "sha256": "06b9mvg192jshhngxdb1zjgmircrsf82hzmzsrpazcbrim6dqq6l" + "commit": "91e047968c4730dfe10d1e94836e0747de8c7361", + "sha256": "1fqmkfdgigfjq9f1i80lpdkidafwa5rk5j687j0kkqwaig9lch39" }, "stable": { "version": [ @@ -89170,14 +89833,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20220604, - 1114 + 20230619, + 338 ], "deps": [ "org" ], - "commit": "f0fe3503f8732ea5e95a4016c6b7ce5b47cf6295", - "sha256": "0a1gp9s92m7scxdf2sc4dqh6ixyv1x7cf190z5d2lz8yz3aw9hkw" + "commit": "ad1885233774e3473ea697c7240e248381a84d3e", + "sha256": "195grf46xnnfi2mcrd02c99ig40rwb6s3hmri5jwm4dd2psawc2a" } }, { @@ -89348,20 +90011,32 @@ }, { "ename": "ox-tufte", - "commit": "0e1592b788ef7218cfb4b3da8599b6cd23eef357", - "sha256": "15b7aml9nl1kh8gbc086nb155f5mzlh8dmq41zi9frn6gskzjnfk", + "commit": "55c339b58875169f8d018adc24264cf5040c72c8", + "sha256": "0jzw4mydvgvsdl0zb5sn9h6ahf86i701zxn54kmyp7g060fmz9wb", "fetcher": "github", - "repo": "dakrone/ox-tufte", + "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20160926, - 1607 + 20230802, + 2339 ], "deps": [ "org" ], - "commit": "ca1b16eb91b25bb4f05e58e9b6692e8486c8c619", - "sha256": "0vyb1ilkywdhjx0j8hq1h993jh6ylwshmqiaa04fq4kbk9yqvspf" + "commit": "352d5ff5d5cd5edcb0d50ce50a5b2aaa8ae6862a", + "sha256": "12hwd2q8w75ha4cs587nmasfxhsnmaacpyznrjpwk8vmwz2ncr43" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "org" + ], + "commit": "352d5ff5d5cd5edcb0d50ce50a5b2aaa8ae6862a", + "sha256": "12hwd2q8w75ha4cs587nmasfxhsnmaacpyznrjpwk8vmwz2ncr43" } }, { @@ -89586,11 +90261,11 @@ "repo": "zenspider/package", "unstable": { "version": [ - 20210124, - 640 + 20230805, + 2115 ], - "commit": "06fbc904e09d3349b669c2624a587fee5accf5ef", - "sha256": "0mmziyswrfj1a43cy6qn1d8b1a302z4w3xk4z5yi5frdr22j684c" + "commit": "57a53a1da75d76a9dcd17008d1c1d77475b9671a", + "sha256": "1qdbn78xsc7r0bx1fpsbf3amf0wc9h84mj60fyxich1jqyq3m7j3" }, "stable": { "version": [ @@ -89610,11 +90285,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20230610, - 2138 + 20230717, + 2320 ], - "commit": "a14752cb5993e4931996a14f94179364645fc500", - "sha256": "1hyhmvjwpy28mh499kbc1sbqkvc59a7qqyzmlnrc9mdwy9ji2wac" + "commit": "20ca024ebe18c47f23af135b5adac2627595e9bf", + "sha256": "1kbvdnfr9jwgi7vd2rz6dr0sndisz60yzlfz848b4a1kjqql5280" }, "stable": { "version": [ @@ -89649,27 +90324,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20230605, - 1550 + 20230806, + 1331 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "2892058fba1f36efd85f6c0d007b40621ab5c68e", - "sha256": "13415b7bz4blnnhccayar1cdgffbcc7r6cff6cgfsdadc6k59b14" + "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", + "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" }, "stable": { "version": [ 0, - 17 + 19 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "78ae823bd89d83299a0d7a52797d2593d03e9795", - "sha256": "0r68zg8md05fp6bx61yf6fh9mj2az8njjbqlcvsc5nbnag0p0r57" + "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", + "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" } }, { @@ -89680,25 +90355,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20230315, - 1052 + 20230806, + 1331 ], "deps": [ "package-lint" ], - "commit": "78ae823bd89d83299a0d7a52797d2593d03e9795", - "sha256": "0r68zg8md05fp6bx61yf6fh9mj2az8njjbqlcvsc5nbnag0p0r57" + "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", + "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" }, "stable": { "version": [ 0, - 17 + 19 ], "deps": [ "package-lint" ], - "commit": "78ae823bd89d83299a0d7a52797d2593d03e9795", - "sha256": "0r68zg8md05fp6bx61yf6fh9mj2az8njjbqlcvsc5nbnag0p0r57" + "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", + "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" } }, { @@ -89873,19 +90548,19 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20210104, - 2224 + 20230804, + 658 ], - "commit": "69caea070379f3324c530e96e06625c3cd097cb9", - "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" + "commit": "c4283f580fa4feeb9abcaebb99709007db0a3159", + "sha256": "11b9mxxly3jsiha1znprkbfsgcxppjr2a6qza1xb3pysk3k8szha" }, "stable": { "version": [ 0, - 14 + 15 ], - "commit": "69caea070379f3324c530e96e06625c3cd097cb9", - "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" + "commit": "c4283f580fa4feeb9abcaebb99709007db0a3159", + "sha256": "11b9mxxly3jsiha1znprkbfsgcxppjr2a6qza1xb3pysk3k8szha" } }, { @@ -91270,15 +91945,15 @@ "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "let-alist", "tablist" ], - "commit": "1885cefc24883c220cdd4acafdf1d14f290a6979", - "sha256": "1idazz46zx2q84di4p73770l4bcnai2a03q95psg827ykdnmjwij" + "commit": "a9c9a12c3ecf2005fa641059368ac8284f507620", + "sha256": "1v861fpzck3ky21m4g42h6a6y0cbhc4sjzpzqx0zxd7sfi7rn768" } }, { @@ -91530,6 +92205,29 @@ } }, { + "ename": "persist-state", + "commit": "b968e7d25a52891796fd6717cc0ae4df664542b5", + "sha256": "0fxfzcyk9fc9p2zn12sfpjhbzm210ygb2r40vhlk4w4b1m6vjmf4", + "fetcher": "codeberg", + "repo": "bram85/emacs-persist-state", + "unstable": { + "version": [ + 20230728, + 714 + ], + "commit": "0b0dd8dca90414db3395860c2bf32a4c736acfb4", + "sha256": "0ib6racii2wrpf9j63bi29r2y54dy7hhwj40ys74isiysk2r8x07" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "d57cc443cc0fd9f8a7418045be2387ee72955bd4", + "sha256": "16qph2j5gwn9d43sig22g604gmpk55sh0v2i4aqvzkn1cl3188br" + } + }, + { "ename": "persistent-overlays", "commit": "d3673c87c5ca883b4f713efeae912c3ad991c667", "sha256": "136acbxqykvsw8a5il1zgpxr7llxmc3347847vf0jnmbzb1b472a", @@ -91849,14 +92547,14 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20230423, - 2326 + 20230705, + 2132 ], "deps": [ "f" ], - "commit": "2e5c777a835283ee4fe9eb20fd82114f348ba1f2", - "sha256": "0m969s0qs70mkfrwq8ccp5skx0pbhchr96cjbzk7l6b7xxjl89vp" + "commit": "4f5ca245531053f10ea234bc5e95fc7efcabe251", + "sha256": "1ypnqqdxxgm0kad37lqfi2q9a6263rx0li3v8dya5f7915sjsccj" }, "stable": { "version": [ @@ -91903,11 +92601,11 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20230423, - 839 + 20230716, + 1440 ], - "commit": "5a7523fee364e8fabf24eeaac3dac2991ef64187", - "sha256": "118pb9i3dfn2029svs3f9rhxbrpgwa19qfj7zssq11n2pzbcwf38" + "commit": "44e7adf94ff19448592bf52595aec73c7278e900", + "sha256": "0chfqvf0260izy73xf8zy4ryq1gzlc1vapk9an2g5mp94ac0im7b" }, "stable": { "version": [ @@ -92269,20 +92967,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20230521, - 1700 + 20230730, + 1735 ], - "commit": "249b31c9b542e7a22050c97fb26ccbf44150b199", - "sha256": "0k7a3dr3y5g0dlspzpjp3fmk6h5ng5hk21payqapg5kjn9rxyqy8" + "commit": "38fd6ec205a02ccad6b3006afef0988e380adfa6", + "sha256": "11i9mr2bmqqd5wryg24im86f287g94yva359rg0szm1fmxgrxw8z" }, "stable": { "version": [ 1, - 24, - 3 + 25, + 0 ], - "commit": "c601f75fb953de1c35929ac5fea5b992388c2900", - "sha256": "01yw10z1kf38nz4z3gmpx56wmc7a7caf4nk6rccg0w4kklqw1h94" + "commit": "168fc4ec28dc54fc4366b64bc9c431ee53f25984", + "sha256": "1vwbxaxjvz2hhb6pli1bh1qlrc2r991zl4i18wiwk78ffanqx6q0" } }, { @@ -92481,8 +93179,8 @@ "repo": "nlamirault/phpunit.el", "unstable": { "version": [ - 20230124, - 743 + 20230801, + 1523 ], "deps": [ "cl-lib", @@ -92490,8 +93188,8 @@ "pkg-info", "s" ], - "commit": "4a36906344c0abc11f48cc08cd8d50a9f46963f8", - "sha256": "03a9brby841kqyjqpyxxxvh60hcqa0ly4yc4flawbvnvm7rm7bv3" + "commit": "e5baa445363942fbd9898ac3cb91eea64b69d316", + "sha256": "08wi2vcx95a4dczx4176hl071hdk59l416aw79rzjgv559qmnmra" }, "stable": { "version": [ @@ -94360,11 +95058,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20230520, - 2129 + 20230802, + 238 ], - "commit": "809ec965d8f6f74ce408e3a8b5974b43371c1528", - "sha256": "1sn6dwa0qgwcaf9fx62n47jbnybip9zdmp5sfcwv638pdk25mdyl" + "commit": "a93ff38ab648eefa1a8eca393b0a357ff41411a0", + "sha256": "1ib4516jd87jgfi0f8n1r9m71xpb5cx5l8djbv1sswkcb95c7n4m" }, "stable": { "version": [ @@ -94601,20 +95299,20 @@ "repo": "pitkali/pos-tip", "unstable": { "version": [ - 20220715, - 1020 + 20230721, + 834 ], - "commit": "bfe74204d1201a33ace81898e7c485382817510a", - "sha256": "1vmmnajdmfaq9psrgv0fd0qf739201qaihhwg5qbqvbm86v2ns1f" + "commit": "90a9babc829b298af36be695009894fc00a97935", + "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy" }, "stable": { "version": [ 0, 4, - 6 + 7 ], - "commit": "1b81694d1dc29253db0e855b82563f84a32b38d4", - "sha256": "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33" + "commit": "90a9babc829b298af36be695009894fc00a97935", + "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy" } }, { @@ -94625,11 +95323,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20230601, - 1529 + 20230714, + 227 ], - "commit": "59911917d57f77577e1aa6df7584fa00636de84a", - "sha256": "123v1lg8q509pqb2nrj60ljqw42333c3gq94p8r5p970z71yinwb" + "commit": "017deece88360c7297265680d78a0bb316470716", + "sha256": "1gv46z6dyy04ivd2sbsifmr140gxv16dbwfzmxj1q9gvhlxxnxc8" }, "stable": { "version": [ @@ -94910,8 +95608,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20230527, - 1256 + 20230723, + 220 ], "deps": [ "ghub", @@ -94919,8 +95617,8 @@ "magit-section", "markdown-mode" ], - "commit": "43b03ccf586b74bf35e59c21c918bb06915651ef", - "sha256": "1fagi67xrdh2p13iih0z2x03w4cpwk9s7xsd2pvkp1544a35rrk8" + "commit": "1296c81681509044865643ed92474a7d31ead9f3", + "sha256": "07hw222gk0kklv84q6hnzcmbh2gds3098mqrjh1f5nmrqvxg6d68" } }, { @@ -95001,11 +95699,11 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221216, - 112 + 20230725, + 2332 ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "e0cca29d99f704b512c8ba426200482bd5e2889f", + "sha256": "074198kksx3zj8x614jngav1b02xzq9ilzgbxc0vgb5v25mdxmhf" }, "stable": { "version": [ @@ -95156,10 +95854,10 @@ }, { "ename": "prettify-math", - "commit": "d35f0bc3077fc53b3e91d8f4129373c10927ffab", - "sha256": "1w59kca9if3pnm5aavvkavk6fh97ayl6r4h3prhn4ib4fznxl7b4", - "fetcher": "git", - "url": "https://gitee.com/shaqxu/prettify-math.git", + "commit": "eb841eacc5d8b93f8d8ea576d24a20ad88bbbd43", + "sha256": "1by59msnq293gaj84yzla7pbi2a110dxia5w77a1gidqbzps1c95", + "fetcher": "github", + "repo": "shaqtsui/prettify-math", "unstable": { "version": [ 20220101, @@ -95522,6 +96220,21 @@ } }, { + "ename": "prog-face-refine", + "commit": "713ab2f5a68c87160c731a22be95f219b1f9819a", + "sha256": "0z48xbbzwbq4maz8pzlnsnrq1bkb54gi1jdk31xmj7maw4f7fc3z", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-prog-face-refine", + "unstable": { + "version": [ + 20230710, + 113 + ], + "commit": "c99853ad732784e27300bdb70d4f1aa59c1f6476", + "sha256": "1r4i9jrlwfa4iynyipyrmp4wzgxyf0sqgcb6nfjpcyg5gmlv7ikr" + } + }, + { "ename": "prog-fill", "commit": "90d680ed481688c9899adb28fbd9a22a17fa8943", "sha256": "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3", @@ -95782,11 +96495,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20230606, - 509 + 20230713, + 1023 ], - "commit": "31b87151b1fe43221736ded957a1123a54e32531", - "sha256": "1pvpgcr82hdpsycxc8854qyimr30kjygwmj95c6n92jywnqwaxnr" + "commit": "971cd5c4f25ff1f84ab7e8337ffc7f89f67a1b52", + "sha256": "1jdl8yvx7yrjgfbsq00mdjwx0ykvi03pqxf3w5qkhvic726mi9ki" }, "stable": { "version": [ @@ -96047,15 +96760,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230529, - 1839 + 20230624, + 1315 ], "deps": [ "compat", "project" ], - "commit": "d2af6e04ba0369be55f66346523dcde1f4410bf0", - "sha256": "1x6k3wza4rw5s2d4fn3ijs2ngx6cxb5zdgiil6s1xih6hxp7dp6c" + "commit": "369ef38490065d6b951981c0fa4b69d49dbb4b95", + "sha256": "1sj9k2cx1qwvvaqhzz0sjj2ql099dr1x59qzhwwixdai6akjf3bk" } }, { @@ -96066,15 +96779,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230529, - 1035 + 20230624, + 1315 ], "deps": [ "compile-multi", "projection" ], - "commit": "917ac108a698056b819e31e7d06e8520150dac59", - "sha256": "0sj9db8vihj0n00viwzxn65zalppys7a3frrs3gz84407qg6czvl" + "commit": "369ef38490065d6b951981c0fa4b69d49dbb4b95", + "sha256": "1sj9k2cx1qwvvaqhzz0sjj2ql099dr1x59qzhwwixdai6akjf3bk" } }, { @@ -96354,10 +97067,10 @@ "stable": { "version": [ 23, - 2 + 4 ], - "commit": "a74f54b724bdc2fe0bfc271f4dc0ceb159805625", - "sha256": "15ayh19inxym8frx2f6161qcb6fh25akx5fvb9ca4433acj326hc" + "commit": "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a", + "sha256": "1n0mn082lxm2skqn62ksppgc6s7qi8gxrhi4fwnb2f20qspad3vq" } }, { @@ -96368,20 +97081,20 @@ "url": "https://git.ookami.one/cgit/protobuf-ts-mode", "unstable": { "version": [ - 20230410, - 855 + 20230728, + 1747 ], - "commit": "cde61510b711d90bf2978ca4cbd3f36fce8b4c3e", - "sha256": "1rzsvzwlpgghfg8brrhzqpiskb8v7ig2jwsr43f423d64a2i7azq" + "commit": "65152f5341ea4b3417390b3e60b195975161b8bc", + "sha256": "0hrxfnmaxlb9s0rqq8pb8lq0kl4w4vk6s62q55mbbhr0ad4c30p1" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "cde61510b711d90bf2978ca4cbd3f36fce8b4c3e", - "sha256": "1rzsvzwlpgghfg8brrhzqpiskb8v7ig2jwsr43f423d64a2i7azq" + "commit": "65152f5341ea4b3417390b3e60b195975161b8bc", + "sha256": "0hrxfnmaxlb9s0rqq8pb8lq0kl4w4vk6s62q55mbbhr0ad4c30p1" } }, { @@ -97130,15 +97843,15 @@ "repo": "Bogdanp/py-test.el", "unstable": { "version": [ - 20151117, - 622 + 20230714, + 517 ], "deps": [ "dash", "f" ], - "commit": "3b2a0bdaacb54df6f2bee8317423e5c0d159d5cf", - "sha256": "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf" + "commit": "72975bb547b6123dcc1213ff78fdcf80f7b29842", + "sha256": "1l17ky2m9kc0xicxzf67j8m6zsczc7s4xjjfndzcrbzkf802c0ck" } }, { @@ -97871,11 +98584,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20230608, - 1938 + 20230702, + 625 ], - "commit": "5a0f907cf0417347964c25436057c7f44b8de733", - "sha256": "09k5s4lk255l6axwnka2fdhb9znk9j3ys04n1ig1393pnhm6awyn" + "commit": "c60a675aac83505f1f664410dce3b4e64eef37a8", + "sha256": "1dbb1rg3r30yfllxvpnximy1rqgbyb6m4saf8gql9s7hyidbri6q" }, "stable": { "version": [ @@ -98193,6 +98906,29 @@ } }, { + "ename": "quakec-mode", + "commit": "f24d1e61a38b83d2cd8f0fa8f8664e53636cb95d", + "sha256": "0r91r00wqi5xrw09p8xyv4i6c6mi9gmqa962w8yjlif7pgw4sd2y", + "fetcher": "github", + "repo": "vkazanov/quakec-mode", + "unstable": { + "version": [ + 20230619, + 947 + ], + "commit": "7b5d13fbdd9dfdc319ee8db1f1e954e00bdfce54", + "sha256": "0xb43s4641xxfbj6ybssp7aj09apw47qz2wlabv12wmsyf63db1x" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "8ac72909fff5135f544012ad3df45d2d890634bd", + "sha256": "1blpyv76nis2p4a67gwmbp0srsqpm2263gih6b00hnm1xf224767" + } + }, + { "ename": "quarto-mode", "commit": "9534fae4c021b7f9c55175a189156c8658084821", "sha256": "1cg26blid1kbnk7r1gzlpsd5gqgiqyr63kld0hqpih066xx5kaj5", @@ -98244,11 +98980,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20221220, - 1136 + 20230620, + 1343 ], - "commit": "79651cd0de497a8db18d79e7598eb01a4eec4f09", - "sha256": "1d5w4yq9ps65i82767h0jqybgpj2m9p3zryb0816d32h0bqyhxk6" + "commit": "b6a73d4e9e06631d2adb7bfbd83bbe7ee4211809", + "sha256": "0r7s7y8y7kj5bl6csqyx2jv2kighhj5ch6ck661r1n3095ahjhfj" }, "stable": { "version": [ @@ -98729,14 +99465,14 @@ "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20220427, - 2227 + 20230619, + 515 ], "deps": [ "flycheck" ], - "commit": "6504424707b6e9101dfbd9fdd4b7b963b9a4f323", - "sha256": "1rp8z10rggd1yzx979kwkldcqhqy19i03r9lw93d7137jassb9qp" + "commit": "5e174a2b09f8326e4bd61d4d392ed32a6b45e3ab", + "sha256": "0k18w3qrp49ha2af8j3aap06w58m14cxg8h3zc15pcnwiywvrg5s" } }, { @@ -99338,16 +100074,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20220818, - 1750 + 20230619, + 1158 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "aff03aeef1e40d2abb244240bab9787f4b3e6035", - "sha256": "15i0x5brbmhh6fif9djnc27gpx5fyh3wnljcxhhy6qrp4whj3van" + "commit": "2c77776a4797805d8633636fd68148dfb32fab65", + "sha256": "1jc0i2p40vj4da9jw0cghh0avkl7dxbd8yw4a7llhmy0716klisr" }, "stable": { "version": [ @@ -100159,19 +100895,19 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20220627, - 825 + 20230804, + 648 ], - "commit": "84cff54b0873fcca6fc0314d7584284e86708e8d", - "sha256": "0gib2ylmm5kp23s2mkhx9b83bh9pxszzdrx55rf1b9gh13qz2nw9" + "commit": "bfe3f1c6ece952d39921db16f601123bdd1748ab", + "sha256": "1vm030lz489vjx1dz1jrnj7zd2b43y98rffdxyshfvxbfv1cbmyk" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", - "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" + "commit": "bfe3f1c6ece952d39921db16f601123bdd1748ab", + "sha256": "1vm030lz489vjx1dz1jrnj7zd2b43y98rffdxyshfvxbfv1cbmyk" } }, { @@ -101251,11 +101987,11 @@ "repo": "ROCKTAKEY/rhq", "unstable": { "version": [ - 20220916, - 1632 + 20230731, + 1544 ], - "commit": "7d9c5dee2e493eb0c5d41afca1b6049de8c2a26d", - "sha256": "0nyjdl2isx4fvfr1vh8dgpm7w1vjc9n3d63gy9lgbrr0gcby16f9" + "commit": "9f571787bf0781c78c277db82394fb9a692ec21e", + "sha256": "15177ds2v87g19nm7hphv8mvfkwqvmmvb4q69y85xh28v8vmpxf0" }, "stable": { "version": [ @@ -101842,11 +102578,22 @@ "repo": "mbeutelspacher/ros.el", "unstable": { "version": [ - 20230320, - 1657 + 20230618, + 1116 ], - "commit": "5702a76a055cc0801bc16d50f32973311b894676", - "sha256": "03v6wkiyw09f5hgahv8mal20gdyigfz4wa9ks13hsc29qn6rp8yx" + "deps": [ + "cl-lib", + "docker-tramp", + "grep", + "hydra", + "kv", + "s", + "string-inflection", + "transient", + "with-shell-interpreter" + ], + "commit": "2776746295d7b0c12c18d4b95e0b8705287666a0", + "sha256": "1k3g9sfw5qdlh9y5nqp4zqjnv6fmi9ncjgrzk73mq23xxd02kp15" } }, { @@ -101920,15 +102667,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20230201, - 2008 + 20230616, + 145 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "62853a428b416e6a5fd3d8f57ff83a1798188a3f", - "sha256": "09jmyym1jrr6mj2y2fwgmx5bcbmpgyr1msqnjpsn9qxg24jalzdb" + "commit": "3f039ae3fda9e52433a8c31d4b6c78c89e559906", + "sha256": "0dw3v7ikggy11j7p5hdv7hj1dgkh0hsbci79xakxr7xr0802amcs" }, "stable": { "version": [ @@ -102435,16 +103182,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20230526, - 1327 + 20230728, + 1157 ], "deps": [ "dash", "f", "run-command" ], - "commit": "21f64775264e0bb5717fe5490f04ec3e2303fb28", - "sha256": "0haaarkpjdxvgdm8p34g7gwgjmzg70bbv0n33f3vpbdibc0zmn5g" + "commit": "1141a0066b0f28cb6814fb0e42e98a3712857a8a", + "sha256": "0z37wl2r9zwlfnirm08ly53mvy8m4i51c01d30yw6yrmfq3fd758" } }, { @@ -102561,11 +103308,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20230112, - 27 + 20230805, + 1558 ], - "commit": "c12348e40531fc7e7325368621a0e5f8031d99b2", - "sha256": "0sy7v0j81qd1mdq862zm0a4nf3g3wyyjjy3kjlmd9kb3l3f5rh0q" + "commit": "fac7d284d24080d0886c47d20bbddbf60ec51511", + "sha256": "0xws2s65r67n9djn3cnydlq4bnjhcak5kfnbcp7d1a2cj6bdwj08" }, "stable": { "version": [ @@ -102814,16 +103561,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20230609, - 1725 + 20230710, + 913 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "c3ea00d8ba8e4dac326066793b4ee4f97a7cdcb9", - "sha256": "1hjpdfh60vi521llhd43pgq1c2k17xnfn2907k338d9sh8pk9gjj" + "commit": "70296a6d7775a6cd7630796207b69920e829b6b1", + "sha256": "0adznwdggam41jr58p67imzwsrcb1p655jn6zl4m4w2wvshsanq3" }, "stable": { "version": [ @@ -103083,11 +103830,11 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20210217, - 1312 + 20230805, + 1359 ], - "commit": "17703495db796fccb3acbae1676f0e7f0e34926c", - "sha256": "02qj8hm26k0m2n1m4ipcj0yw32hkr45c7b2wga5fsd9kjs8xdas1" + "commit": "abfb5e1f463cffc18218a0f7f2fa141a271b1813", + "sha256": "1ijzsizxbq33wv84hz4km3x6nsaqxn8v9qh2835vnrfxk6n6cr4p" } }, { @@ -103371,11 +104118,11 @@ "repo": "meain/scopeline.el", "unstable": { "version": [ - 20230521, - 614 + 20230622, + 829 ], - "commit": "6733f0f7ca33aa5c8ad83099dcb7b7ff8bc46a68", - "sha256": "0cl7vidpa2mwr5ki9a8h1w6myaq96m9ra8dkrlhs9hr16mmxyvpa" + "commit": "254d300aee0a22349b07fbe542fbec81547bae75", + "sha256": "1q4x5fmx95isiq47nk7r3q0n3q9dvbl855yph0p6wy7rr999v3jb" } }, { @@ -103386,14 +104133,26 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20221125, - 1731 + 20230627, + 1800 ], "deps": [ "htmlize" ], - "commit": "56c67ef63be86ef1f03e15a62ad17c3983e1e5dc", - "sha256": "1ndfcb4zj4vangav1n5g6mbf7ys3a5kw1q4a7dnr36f2n2f6rnb4" + "commit": "4723c551951c5e86ceaf078846f4f46db38739fe", + "sha256": "0hahk2m0cvky77h9p5zrfx0qcig4r3qyp9c1ji02kal64i9aib1s" + }, + "stable": { + "version": [ + 0, + 7, + 0 + ], + "deps": [ + "htmlize" + ], + "commit": "4723c551951c5e86ceaf078846f4f46db38739fe", + "sha256": "0hahk2m0cvky77h9p5zrfx0qcig4r3qyp9c1ji02kal64i9aib1s" } }, { @@ -103679,11 +104438,11 @@ "repo": "precompute/sculpture-themes", "unstable": { "version": [ - 20220601, - 1349 + 20230728, + 1045 ], - "commit": "ff2fdd1c38cb9f3f1abf420b77d1ef3a2786ce57", - "sha256": "1pwj9snqr87x16h02fnls90m63c3v6y35zcnr2f5sq9ydfxrzijn" + "commit": "b6267c23afc1c40d7ba477f4c8db319c5dfa51a8", + "sha256": "1fpwgw95lbs2bj9f2zsim8f70729rva3j2f5jwqq6zskh4alwg3p" }, "stable": { "version": [ @@ -103929,11 +104688,19 @@ "repo": "erjoalgo/selcand", "unstable": { "version": [ - 20230604, - 2132 + 20230628, + 733 + ], + "commit": "b6fc231a784df570df0f817d34f926f141a65126", + "sha256": "1hh0y9qy19kvq29z5zrjpk2lll2iydl16dhl88kapfprmv9mrli2" + }, + "stable": { + "version": [ + 2, + 0 ], - "commit": "c41b4c8a4ee01f8c069b219e2fea16a084c79f19", - "sha256": "0nm5104n2i7a80qncmfqsl7nlclzgs0ixy33r0wzbf28qawj4vk8" + "commit": "b6fc231a784df570df0f817d34f926f141a65126", + "sha256": "1hh0y9qy19kvq29z5zrjpk2lll2iydl16dhl88kapfprmv9mrli2" } }, { @@ -104054,6 +104821,24 @@ } }, { + "ename": "semantic-thrift", + "commit": "f484ba1c47ab76321616c0def07b3c78a063f754", + "sha256": "0szbin2nxradkjk8h4xyw90j04dj0nfc68rrlgx4sqjq55cy6fzl", + "fetcher": "github", + "repo": "jerryxgh/semantic-thrift", + "unstable": { + "version": [ + 20230711, + 958 + ], + "deps": [ + "thrift" + ], + "commit": "87029282bd59cbba6ae815c0b1a207f02813f5dc", + "sha256": "0bvwj401ixc9zclsm0xzkrw62jrsa24dsrgpb6fyra91rvnmwm27" + } + }, + { "ename": "semaphore", "commit": "1cffd8c7720e5a262b8635a5fd1ca36766f4c824", "sha256": "0g49ld0j962k66a96z6r6hw1p13r5bxs0wddpr9iciqgjra1jcl7", @@ -104114,16 +104899,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200812, - 1027 + 20230702, + 1446 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "7a9a8305f7b54ee59e4c29b33ef5fd4058ba4219", - "sha256": "0sm6kd0r7wjsvynfkhq33d6rz431j784jlbxjpag60g5avxha9s9" + "commit": "23d684ac590fad6aa3c5ce3962c4683c1eb8fdb5", + "sha256": "1146ap0jl1n0qfn117r3iz98zm3qfwm5w0hj0gigq0cqy9c305lb" }, "stable": { "version": [ @@ -104460,15 +105245,6 @@ ], "commit": "3be207c50dfe964de3cbf5cd8fa9b07fc7d2e609", "sha256": "0h0f93343wvzckwgj8fga62vnqjx59r3xrpq1yy73q5ysj6s92d4" - }, - "stable": { - "version": [ - 2, - 4, - 2 - ], - "commit": "3be207c50dfe964de3cbf5cd8fa9b07fc7d2e609", - "sha256": "0h0f93343wvzckwgj8fga62vnqjx59r3xrpq1yy73q5ysj6s92d4" } }, { @@ -104768,6 +105544,30 @@ } }, { + "ename": "shell-command-x", + "commit": "30aafd674793a98e2ef3f6c586b45fda61dc21d4", + "sha256": "1jif2dbllkx17rg8pagxpfrch2k65absi1qpk34rki6jzbr3ivyw", + "fetcher": "github", + "repo": "elizagamedev/shell-command-x.el", + "unstable": { + "version": [ + 20230702, + 1852 + ], + "commit": "416dad677314e3eec704d5b02594b5f8a7e7fd65", + "sha256": "0my8yar603zdirr0wbyff0y8lqinkf808mipzf1j9skbgyjqfghc" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "416dad677314e3eec704d5b02594b5f8a7e7fd65", + "sha256": "0my8yar603zdirr0wbyff0y8lqinkf808mipzf1j9skbgyjqfghc" + } + }, + { "ename": "shell-current-directory", "commit": "edcb78c3491a5999b39a40087b7f991c2b737e30", "sha256": "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd", @@ -104820,11 +105620,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230604, - 909 + 20230709, + 2036 ], - "commit": "5ae92d7d43b9dc2d1f1de6d076b59fc6cbaadcd8", - "sha256": "03gmmg7a4bfzmmq0cx7xxhw4x6gbwkgppsgnapgvn9biisrzjr8s" + "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", + "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" } }, { @@ -105147,11 +105947,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20230324, - 125 + 20230630, + 124 ], - "commit": "f8819bca0c97970662cd4214f8f3104ab4a376c1", - "sha256": "1yk41h28cbi5qfh4jx173f83f73anf3imwfqary58yq159n47im8" + "commit": "ea60411ff2170872f6fb1fe858ffad41580009e6", + "sha256": "0ciicnhrh486il7wl9qn9yl3rafq89vsjyq3bq76qf64rpdmy246" } }, { @@ -105337,15 +106137,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20220523, - 1440 + 20230805, + 500 ], "deps": [ "language-detection", "org" ], - "commit": "b3916e1ebe2477c031db1440d9b57e373c0354fe", - "sha256": "0m357d795qcn1l2gynglzdrdc9h197vj68436hkwnc1j72zhcpl4" + "commit": "946154a05b14a270f80351d5b2a98b19aa6c5745", + "sha256": "0qqvw7az7cr20kss7szvwqmbznqb160jg13akdxkiiksgzng0f90" }, "stable": { "version": [ @@ -105899,14 +106699,14 @@ "repo": "skeeto/emacs-web-server", "unstable": { "version": [ - 20191103, - 1446 + 20230619, + 642 ], "deps": [ "cl-lib" ], - "commit": "22ce66ea43e0eadb9ec1d691a35d9695fc29cee6", - "sha256": "1ghwfrnml8qmfm981xrrqga2ayw36pqv9s2zqaqzl6szzpwnkz8i" + "commit": "6260232da8b53c4e214bc5e427ec00c3ebdd9869", + "sha256": "1lykq4pr6723k98mrnh3c2schpnsy0rjjrxzmb00pagcqhvvmc8c" }, "stable": { "version": [ @@ -105929,15 +106729,15 @@ "repo": "semenInRussia/simple-indentation.el", "unstable": { "version": [ - 20221127, - 1232 + 20230625, + 1610 ], "deps": [ "dash", "s" ], - "commit": "74efe02aa6c1612ae9b32b88f97b7d6d309726b2", - "sha256": "03dmq63cqymj37mnqxgm4qxmvv6vcxbj5kanr0qwdv1nzkh16dgw" + "commit": "b5f97fc14b3f494cfe009938cf5ee9016a83d30e", + "sha256": "12q98g34snr7dciwlfsvzg5mi7c2wng7q1gxr9raib0bvficifp0" } }, { @@ -106530,15 +107330,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20230610, - 829 + 20230730, + 1734 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "50d4a7b16893612b61715c3818717c4d1afd67db", - "sha256": "1qn7shpklb6pyfgfqwwdas7gmbdz5v4mbhcn4yaq5g1ljvyp8g7x" + "commit": "1e4b7417a1ade842ba4938f66445af68a93176b9", + "sha256": "022v6xk8kwnvvlv5b2lp5snwbvkl0297whs6vyqch2qyf22jdb8y" }, "stable": { "version": [ @@ -106769,11 +107569,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20230523, - 1254 + 20230624, + 1930 ], - "commit": "e6bc13d9f55e3763e6daea527cb88a776c479d8e", - "sha256": "0fk06gy2m036smyq57dsv5hsc9bh1879q114qfmk8ch77h0rd8dj" + "commit": "df62abae73bd511885c9c7ec0ea7ea1469a00923", + "sha256": "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv" } }, { @@ -107749,11 +108549,11 @@ "repo": "jeffvalk/snap-indent", "unstable": { "version": [ - 20221220, - 1908 + 20230704, + 1833 ], - "commit": "6020a1784015ba28f439f41d4d8c261c3481079f", - "sha256": "0ph6xfylfxpkdsa1bipfj1x36b5rblr8v33kkgl9kjrp69v7fyb6" + "commit": "c4e49295aa1a2678c0e9232c12448fd944aced8e", + "sha256": "01vhi6vd3w1dj095l4qy0swjassp88gjrwgc3zqzmsixzziv99s9" } }, { @@ -107942,26 +108742,26 @@ "repo": "md-arif-shaikh/soccer", "unstable": { "version": [ - 20230604, - 351 + 20230718, + 910 ], "deps": [ "dash" ], - "commit": "556b043bab9ac8fd6132bf415ba048580c59ae1c", - "sha256": "0fa0lmdlfkri942qzzplr52pyvwa2zq2cidp98p45a7slh90v0cp" + "commit": "5d8ff098eb91367e54a454d3f382940b8f5af81b", + "sha256": "0fyz2ffihi31364wq2p16j2968c31z8d1vilf6cplkq1knvz57my" }, "stable": { "version": [ 1, - 5, - 0 + 6, + 2 ], "deps": [ "dash" ], - "commit": "4515eaa5e12613185f4569c79772db886dcfa2f7", - "sha256": "1l6cjn7dfg2kp9rqb69661q0c2v1jmxfr7by8r9pig5m6k98jvzc" + "commit": "36d22b2acda00d203288cf5b4cc1d8df567f57d6", + "sha256": "0wj84r6bidfjmb8qfz6rrbn958wlvqyhjkw9inkilk10ir0dfndx" } }, { @@ -108083,20 +108883,20 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20230507, - 1413 + 20230805, + 726 ], - "commit": "0f0b1129cf51c85904f9e015da4fcca5f5f7a4ce", - "sha256": "0l2lcdm2hsjasfkg4rmypa4mvbhglbkkyv0jg88ygc6py9klcccd" + "commit": "100542418b19859f9828114eeaed2be1071367bb", + "sha256": "18r651hj05vrmwnyhgdy1v8sfq9izb7r4b6mvfnq0my7pwbxck73" }, "stable": { "version": [ 2, 0, - 1 + 2 ], - "commit": "0f0b1129cf51c85904f9e015da4fcca5f5f7a4ce", - "sha256": "0l2lcdm2hsjasfkg4rmypa4mvbhglbkkyv0jg88ygc6py9klcccd" + "commit": "100542418b19859f9828114eeaed2be1071367bb", + "sha256": "18r651hj05vrmwnyhgdy1v8sfq9izb7r4b6mvfnq0my7pwbxck73" } }, { @@ -108140,11 +108940,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20221119, - 1735 + 20230628, + 1637 ], - "commit": "ddb4a901c33bd29ba2eefff3b7f7461849c6e833", - "sha256": "1hppvvh9mq7yg129490b66bmdnnx6c03acbml03ipbcrfc6950y0" + "commit": "8ba549e429e86778a0e079648f3bc3463fcb15f6", + "sha256": "02lh72d7s2r0s4wmmxd84rs1wpvmid2l2nz4rpzipldkwrdbn95f" }, "stable": { "version": [ @@ -108524,6 +109324,29 @@ } }, { + "ename": "sourcepawn-mode", + "commit": "afe235030d518a0a89adbcb2d125af2ce5e1dac0", + "sha256": "01v9xvxq4rshc3d0z9dyi352fqwkghr9qqm7rmbv6ph75wpfdv25", + "fetcher": "github", + "repo": "agrif/sourcepawn-mode", + "unstable": { + "version": [ + 20230628, + 1821 + ], + "commit": "1f100431f34b51c5374ea0dd71146c870555ea82", + "sha256": "1iky6hz6la4lbl7v6d9999i4mp0g2kr0w5ccbs8kc44s82j2axcf" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "00a2170d267b5d3db71c3c00502871c138c1d5dd", + "sha256": "0mkmnkz92zgqbi6pspzlbkjva5f3bvzalyaz4vpisyizvhpi2qg3" + } + }, + { "ename": "sourcerer-theme", "commit": "8532e062b1830d8cf4e7f72518131a1f32762b37", "sha256": "0xikcln8sz3cic5a77cdvq2aazy1csf1qfxgmcavpqz54ps14j1z", @@ -108695,6 +109518,21 @@ } }, { + "ename": "spanish-holidays", + "commit": "843f452094c3e794200bfb2e9181892c22708c35", + "sha256": "068mkkg1bq8mx7kybajykcy2p2x0bawsml8wlfff0ig9975ardz3", + "fetcher": "gitlab", + "repo": "gnuhack/spanish-holidays", + "unstable": { + "version": [ + 20230626, + 805 + ], + "commit": "26d552ae71f670dc966a3b7b7614d1622bce9f38", + "sha256": "1rhzcs5zm3z09kmwf2hmhq8sl3vf5qclb5j7lyazr4hmg52f4k22" + } + }, + { "ename": "spark", "commit": "f4d1529ab86de7c033579b1a1d0084899c16f454", "sha256": "0dv7ixv9gw6xxhw5zm4gmv2ll4lja8hmn2pdizlqxaizpm245rkn", @@ -108792,11 +109630,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20230610, - 116 + 20230805, + 107 ], - "commit": "12ddafcb939594fb3c6542fc62c2a7da15071055", - "sha256": "098xsfyp4mgmf6ng8cwwp4gmbl4glg171b7k73dpf2ixvkrxccxj" + "commit": "9faa42c161f18e79cdab6d796eaa33bfebbf9418", + "sha256": "1ypgvw63yqxaz7ay99xkjhjbyymi8x0sq4lniyhbrr7aix0zn7dp" } }, { @@ -109675,20 +110513,20 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20230129, - 903 + 20230702, + 928 ], - "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", - "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" + "commit": "95fb076c9b657c5f1bfad3ee5bf1f8691c50d428", + "sha256": "0iwciwnlkpbasnwdvvip5g39jq4qc8srfw0s07ljb3c3njg3jhsg" }, "stable": { "version": [ 3, 1, - 14 + 16 ], - "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", - "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" + "commit": "95fb076c9b657c5f1bfad3ee5bf1f8691c50d428", + "sha256": "0iwciwnlkpbasnwdvvip5g39jq4qc8srfw0s07ljb3c3njg3jhsg" } }, { @@ -109813,6 +110651,42 @@ } }, { + "ename": "starhugger", + "commit": "5536f88967ceb90313436bb5fa70e3060e37ab42", + "sha256": "1xsfn9qb6kabk3fy9yf75m10pc16w5n5c3dihg9giyr1r0q4qgmh", + "fetcher": "gitlab", + "repo": "daanturo/starhugger.el", + "unstable": { + "version": [ + 20230717, + 1036 + ], + "deps": [ + "compat", + "dash", + "s", + "spinner" + ], + "commit": "8b429cb2f7b5ad0d9c89db4577df5c7f8f5d8f6b", + "sha256": "0vnz3jk53xnykjyqq5zk9ipm9019x690m7sxk7djxlp6bj6kfw9g" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "compat", + "dash", + "s", + "spinner" + ], + "commit": "8b429cb2f7b5ad0d9c89db4577df5c7f8f5d8f6b", + "sha256": "0vnz3jk53xnykjyqq5zk9ipm9019x690m7sxk7djxlp6bj6kfw9g" + } + }, + { "ename": "starlit-theme", "commit": "4b695ee03d16e9253674cedaef785c2545113b67", "sha256": "02qb70fgnp7r35hz2g53rpc792rh568ddxgxxsbfw5jg9f429z9x", @@ -109979,20 +110853,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20230525, - 1553 + 20230725, + 1528 ], - "commit": "d34715b1f63643ed5f13516df614aa729bd65fd8", - "sha256": "0h54c2g6lrlviiigg863wf2kmy4qb1ziizd3vi9ngszfy5iqnqd4" + "commit": "cee9dfd7d12b86178bcbf1d48679f298f94113b3", + "sha256": "1dxzsdmwqlkgk1q3l803mpy50amda2kqfsgfjv9lc31cx6h36jma" }, "stable": { "version": [ 2, 3, - 0 + 1 ], - "commit": "d34715b1f63643ed5f13516df614aa729bd65fd8", - "sha256": "0h54c2g6lrlviiigg863wf2kmy4qb1ziizd3vi9ngszfy5iqnqd4" + "commit": "cee9dfd7d12b86178bcbf1d48679f298f94113b3", + "sha256": "1dxzsdmwqlkgk1q3l803mpy50amda2kqfsgfjv9lc31cx6h36jma" } }, { @@ -110082,15 +110956,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20230105, - 503 + 20230625, + 524 ], "deps": [ "async", "dash" ], - "commit": "327488e0f1232616bf33ab1a69da1a53aca25371", - "sha256": "14rqxr2w6jcz9vaq3v0mpm3jxv4dyl95y4c5pvgvh8h97gxjb16x" + "commit": "cdffcaa6bb75c450a511a31d0c69e30a4edd562d", + "sha256": "0dmg2zh92la3qw9swzn4pz3qmn0qs6rd84dihf43v9r2682nrqb7" }, "stable": { "version": [ @@ -110296,16 +111170,6 @@ ], "commit": "4683c9020da14bb1c1f74b90d27a4d9fdc7a9147", "sha256": "08gk3z185jhvl8azkn8rccgv72imp14rqw44mlszhrvqjafdd3z0" - }, - "stable": { - "version": [ - 0, - 3, - 1, - 1 - ], - "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", - "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" } }, { @@ -110321,15 +111185,6 @@ ], "commit": "333d210cacc7ebac76e14dfc8c0139f0e399c9a7", "sha256": "1nbk1sqfnyn65mkmgaiyznyqbihrxmlr9nn36p8152dfia71rjnz" - }, - "stable": { - "version": [ - 0, - 9, - 8 - ], - "commit": "4d0603e52b5bab993b3be63e3654c74f641e677d", - "sha256": "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f" } }, { @@ -110680,30 +111535,30 @@ "repo": "kiyoka/Sumibi", "unstable": { "version": [ - 20230610, - 739 + 20230727, + 1249 ], "deps": [ "deferred", "popup", "unicode-escape" ], - "commit": "2705b96eec49e742f661651cebfc7b4c3e6c5416", - "sha256": "1ix1i5qwbqv3cazljyyrm2pmi113z0njzxyj8s4vqqbif5l0m6x8" + "commit": "d934aee4d6a2493e40db3d848d459d97c8e2e229", + "sha256": "0q7r80lsnx4mm74ybnhd9lpwkr4mcm96kdrdx5yia78mawkiym03" }, "stable": { "version": [ 1, - 6, - 3 + 8, + 0 ], "deps": [ "deferred", "popup", "unicode-escape" ], - "commit": "e23cef243d4b635a5e24e0b8684c256edf3d73c9", - "sha256": "0ar88ylhvx0j6h5q8r2clk5r9vm9w4va8nnz33xsrmqrlgwssjvi" + "commit": "d934aee4d6a2493e40db3d848d459d97c8e2e229", + "sha256": "0q7r80lsnx4mm74ybnhd9lpwkr4mcm96kdrdx5yia78mawkiym03" } }, { @@ -110900,14 +111755,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20230110, - 1824 + 20230803, + 504 ], "deps": [ "svg-lib" ], - "commit": "9f5c2cb862fcba96f247b85fdd1b7dffff7af93a", - "sha256": "10gy0pa0147phgx75hh21kgpg4j78v5dcl7alfq6apsximjz8w9f" + "commit": "0e0ea48799d8911ed6c1ef60565a20fd5cf3dae4", + "sha256": "1imsj3hwjx6rlcf9a66r4n1jzgxckhaq7y03mf5lii7kdrgrj26i" } }, { @@ -111022,14 +111877,14 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20221211, - 1439 + 20230731, + 1819 ], "deps": [ "dash" ], - "commit": "117eb40691e7a4d2dcd6b5a7fd9f803c7d42c32c", - "sha256": "08jjwh2d1hjbbv493qgaznxjhjhm7ama27wcnaag6mics7ivn59n" + "commit": "be38a30e41ea1d1ac670679c7e890cff6204f581", + "sha256": "05gav2vqymfybr613k1c42brk2n7sqnvfzfd1a3cs8hjsx07wr2c" }, "stable": { "version": [ @@ -111167,26 +112022,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20230603, - 809 + 20230724, + 1335 ], "deps": [ "seq" ], - "commit": "83b691db601afaa09f0da48f20cdb399086823e2", - "sha256": "067pnjifycw97l2y3ig4xshbd625nhsw30km070qrmvsrrf62x4p" + "commit": "d900694d0194df4c8b0993d383e3b6bb0f71ef31", + "sha256": "0y372d97jgw2f3i44iyih8xxsaw935s4sfjydfmcdh2dsf8ljhc7" }, "stable": { "version": [ - 8, - 6, + 9, + 0, 0 ], "deps": [ "seq" ], - "commit": "cdd194cbadcee724a9813da386f0a612082b1ab1", - "sha256": "16c5xfc29gi8mv0liy8n689zy8fp8jbymljik3qpcazrhyav7rf7" + "commit": "55da7a32c97c84c2d12295a0eeb1f8fca8a6f71a", + "sha256": "1bmlbfhxly0lgpndk5p7m7ld5w85gvnax1bvlaqxjvw1l55vhyxh" } }, { @@ -111488,14 +112343,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20230602, - 851 + 20230729, + 807 ], "deps": [ "seq" ], - "commit": "7c7d369bb749d96346b40cf714884a39aaa743f4", - "sha256": "0k68d6xry420pd3c4xd3rh21bngq7lxapxq4ia704nd5nxk2bl3m" + "commit": "a783d7b5d8dee5ba9f5e7c00a834fbd6d645081b", + "sha256": "1ah4y3j0kdzf3ygrba5bjs04fpbpc9hwrzb8bb8ql0r42vdhbng5" }, "stable": { "version": [ @@ -111791,26 +112646,26 @@ "repo": "enricoflor/syntree", "unstable": { "version": [ - 20230422, - 1957 + 20230621, + 2048 ], "deps": [ "org" ], - "commit": "21ca247722e0d82e8f6eeb280014c61b2ded7f27", - "sha256": "0w2s6ckyx4k43ak4b3vqk44avlvv5h5dgvrxpdgjpk22v1a9123z" + "commit": "7bbbd4904b0ffe452ec39630042dbc85a7a0b233", + "sha256": "1qdbi0zgz7i1m4h7za2pay5gc6yzf4z1r6yyfdqbqnckcl61pr3a" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "org" ], - "commit": "fa0a590bc92ed956cc8a0e5661bca27f6d781f98", - "sha256": "101ql0ih85nxqawf1d6r0g8qiy50rwzhssmwmfrx2r1ss47yk4iv" + "commit": "7bbbd4904b0ffe452ec39630042dbc85a7a0b233", + "sha256": "1qdbi0zgz7i1m4h7za2pay5gc6yzf4z1r6yyfdqbqnckcl61pr3a" } }, { @@ -112153,14 +113008,29 @@ ], "commit": "5f7b71a92bfb25418d7da86ad9c45f14b149496f", "sha256": "11vmvrhmsxy97bfj7jndpc58bik7177i3wvc45mlyldxwyirs962" - }, - "stable": { + } + }, + { + "ename": "tabnine", + "commit": "a26ebc0ff3a9fbe4480db80634491cce1b39713b", + "sha256": "1sxdp8yb8j52yjfx1i82x3pa7qfn1zh3xwnyvyla4442dqwcyvdy", + "fetcher": "github", + "repo": "shuxiao9058/tabnine", + "unstable": { "version": [ - 1, - 0 + 20230801, + 219 ], - "commit": "f6b495d09494784163c3e6ba75b771b71fe226a8", - "sha256": "0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy" + "deps": [ + "dash", + "editorconfig", + "language-id", + "s", + "transient", + "vterm" + ], + "commit": "ea7a6caea7061df61fbd03f9bc9ed4974cf4a1f9", + "sha256": "18adl4sgsmvzsy454rxkhx9dbmqz9k6s26sbyc76dldzlpam0jvq" } }, { @@ -112171,14 +113041,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20230307, - 2235 + 20230612, + 1404 ], "deps": [ "project" ], - "commit": "315a5b375f9276f9725991c42a7c8a63ff26d51f", - "sha256": "05xfj39rhwx73f6wzwgs6vmlkz8qrykg853i054b1kbywpawjlzf" + "commit": "9c0915e1b19a1bbc65a365be3f7910a15dba3ac4", + "sha256": "0hqfhgjlamcrxxc3agbyll0x6ci9i85ansgfn2i4ifmhxgn70y8c" } }, { @@ -112377,11 +113247,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20230518, - 1937 + 20230718, + 1418 ], - "commit": "3dc0a7176462964fa6a8485667a39fc726d74755", - "sha256": "0y4cq86v34h5wbisy6bvq4vz1fbk9lshwjjscbmdd9hbvwn73rpf" + "commit": "33a87374f4fd4d6c45c8ae433b9735e72d7a60c8", + "sha256": "12c2ss4m5c9gm7k02fh1a72b41qfpnpj1bavqn1qhc83hbd5rc6l" }, "stable": { "version": [ @@ -112568,15 +113438,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20230608, - 1246 + 20230806, + 1040 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "6d6df4047c8242602d9bb69895957f9c1b6ecb40", - "sha256": "0b4blw83qnvbfvl78k7i0ynvm7477c5qr0zbbzfjhbclvmd1adbi" + "commit": "c9d51f23bf2d4cf00b3b8686394333ae3ede27b2", + "sha256": "0cnjm4awb7y6fjp2i0wxsks2vd8vvnscrym4rc97gmhc3dlpjn9b" }, "stable": { "version": [ @@ -112649,6 +113519,24 @@ } }, { + "ename": "teleport", + "commit": "53f372efb6b6a5e09de3ce288f84b569d1c31fa3", + "sha256": "1pc7khyq9mcwbb1fry4k31p6gylrl7ld8fjgcng4xvb1x4aqszr2", + "fetcher": "github", + "repo": "caramelhooves/teleport.el", + "unstable": { + "version": [ + 20230723, + 2009 + ], + "deps": [ + "dash" + ], + "commit": "c1414e906c16edfb98db5f5a60000bf9c7dfdfb6", + "sha256": "1myjmj4n3qczl378jdyf1yw3y37430mci581gnyqriqj9nv57ik7" + } + }, + { "ename": "teletext", "commit": "bb8c8385f8214a47dadf6a3e6f614cb98949095b", "sha256": "05q8jq5pcrchp33pd43f8lf8sf67m1mj2a8qn2ly0ci0885gif6i", @@ -112689,25 +113577,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20230515, - 1854 + 20230801, + 910 ], "deps": [ "compat" ], - "commit": "7a6a95825d55df868a869cbbc80412fb44f6520b", - "sha256": "01kz91jdp0rmpp2b5j6g5n0qx4mrmh351w9pz2f40p44d18fmck4" + "commit": "eece42f153487238a6745e0ce2e57a606669bc17", + "sha256": "1cc087a58x84jwr14ac8hn7hjhhb1bpp8xbwba553y91ldxbqww1" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "compat" ], - "commit": "66e4763087f3e851956b9a77a00527b440737d03", - "sha256": "1qhy9rp0k74hbqns67iwyzk86x7rriqyd4l48j5qqmfvr3v5sg1m" + "commit": "fd46702a849b23c9d9b39cb7810a6d727655d9d0", + "sha256": "10dcf56x74jrbdzaa9kphyzq2rz5alv800dnnzpbnvwzh29lfyka" } }, { @@ -112718,14 +113606,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20230504, - 428 + 20230726, + 1409 ], "deps": [ "tempel" ], - "commit": "8903f03227d3c3b83d31e6bb095743c350bcb578", - "sha256": "0lybigqcwsyihhzrk2989fmzjjf8za8yggdr78dkws9yz464zzz6" + "commit": "b6694d385c6eb04f4931af219de5c4b2b8541599", + "sha256": "1b0lh6zzwxb6f58dpaj6jzl7rrx95yzsi0m0r9bb7wnyzyzxakhx" } }, { @@ -112948,14 +113836,14 @@ "repo": "IvanMalison/term-manager", "unstable": { "version": [ - 20230603, - 2252 + 20230724, + 8 ], "deps": [ "dash" ], - "commit": "a3ea91855b4c16b4448ae360ba8bd2c1e08bff6b", - "sha256": "0vjw6dzcz3xpnf0fh7j0kz6c5j07mbcc55xsqq2jdh0554f56pgp" + "commit": "c6da6a36d30525cf054f4d78912957c2f1952197", + "sha256": "11hbm1c81py4mg1kh05ih5h5wxgqqbvdq5qcc1x9nsp807j0r17f" }, "stable": { "version": [ @@ -112971,6 +113859,24 @@ } }, { + "ename": "term-project", + "commit": "20d9871d8f90c8de5431baf6765151e475af55d3", + "sha256": "07fax7xzf3imc3gi6kmaxyscykq0vd25p4mz28lzq0g0z2lkvqfg", + "fetcher": "github", + "repo": "IvanMalison/term-manager", + "unstable": { + "version": [ + 20230724, + 1651 + ], + "deps": [ + "term-manager" + ], + "commit": "f6e55491aedac15b9bf1ef92aaebf35ba9c9dd94", + "sha256": "0ra4kjzh64kmv3f4lc31sh5r84ands5rvj3hhpmzr157dm9zsj4c" + } + }, + { "ename": "term-projectile", "commit": "5260876280148fae28a459f07932cebb059b560e", "sha256": "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag", @@ -112978,15 +113884,15 @@ "repo": "IvanMalison/term-manager", "unstable": { "version": [ - 20230602, - 2050 + 20230727, + 2308 ], "deps": [ "projectile", "term-manager" ], - "commit": "2f873bd7e9c0a275f84fc08dfdd9c0f2426e2b08", - "sha256": "0wsbwizrxvawcz1gqdba47iqn667j7sfdd7bg66v3vxar7x46806" + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" }, "stable": { "version": [ @@ -113779,21 +114685,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20230608, - 616 + 20230726, + 1838 ], - "commit": "9adf90f43fba510bf6a40f3fac24904202305020", - "sha256": "1xmck4c2aiygnm1v4snb21nlv7d0419zmnjiaaimk3c25xwcbgvj" + "commit": "c51cb5780198089ea5997e825f7bf72d249ec8ef", + "sha256": "0iba83a8hbgvdjvw9jp8daydg1d165m6zkjdmvhrpmnsp3fq6kiz" }, "stable": { "version": [ 2023, - 5, - 22, + 7, + 31, 0 ], - "commit": "5f8415018bf7f1a5396b8492c5dd11a447aac303", - "sha256": "0wnbliir1487mf0pq6m98170gws695miw087xq2d0xavfkdyb84l" + "commit": "c51cb5780198089ea5997e825f7bf72d249ec8ef", + "sha256": "0iba83a8hbgvdjvw9jp8daydg1d165m6zkjdmvhrpmnsp3fq6kiz" } }, { @@ -113843,14 +114749,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20230312, - 1245 + 20230616, + 734 ], "deps": [ "haskell-mode" ], - "commit": "3ac320020d809ea626fc283839fecb10c9da4ce2", - "sha256": "1imqmg4naffiplpc3m74jvf26xwpy6026s61sg4si290qz3cvfq4" + "commit": "8f7b9368c78f56a3adc30a02a7056970d2afaa3f", + "sha256": "0y42763f7kgnzvh7abr0kjald61hb1m7y18xqkq3z4ja0xppqwss" }, "stable": { "version": [ @@ -113873,8 +114779,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20230605, - 1410 + 20230620, + 1444 ], "deps": [ "cl-lib", @@ -113882,8 +114788,8 @@ "flycheck", "s" ], - "commit": "bb09bccf070c1915ca8dbaaaaee4e9e3d7ab2ec7", - "sha256": "01chyr71b8893jxgf4wncpskfmg9iwfpcaxq0vfc6yaij46yfhky" + "commit": "b38dfc3f8fb754e64e48e76fc92d472cb3d1a3dc", + "sha256": "0s1wfsn6z828zxydd0cmfy9c9nix77snx10cr2va8wdrsp0sy14s" }, "stable": { "version": [ @@ -113902,6 +114808,36 @@ } }, { + "ename": "tiktoken", + "commit": "dad46a14983cb72c5f5ded8b1a941b91d4fa91f2", + "sha256": "0ihj2vmrfz27wbv7g95l1fbyz5j3i8p9y0z1hqd3d9vhi45fyi27", + "fetcher": "github", + "repo": "zkry/tiktoken.el", + "unstable": { + "version": [ + 20230719, + 129 + ], + "deps": [ + "f" + ], + "commit": "957ece897933460d532057fe60cfddcd9e49d8b5", + "sha256": "14f17m7kzppax9qm7f9qqx88sy8608kcb3pmcsaa7crpl75a9k2g" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "f" + ], + "commit": "0e48dc3e322e8bee03f07a6dd23b9b3f026400a8", + "sha256": "050fl60krrfgkx0ib6rnmx4hmlcskbdhvia1crd0vqd09mhbl7pa" + } + }, + { "ename": "tikz", "commit": "fcf5b1f01558daa1c178275435bce7a07867c1c1", "sha256": "0zmzfz8hf4vnsqg0rmcjhzpdgibdnbv6pc0y9wr6fzrz5wy660qp", @@ -114312,11 +115248,11 @@ "repo": "acdw/titlecase.el", "unstable": { "version": [ - 20220728, - 2253 + 20230714, + 323 ], - "commit": "1fc48a505a0bf7d0e8b1bb25425993212576a3ef", - "sha256": "1hvkcf2crpf23p241mcaack6mr43p1p18772gckg56iw8bw8n14f" + "commit": "eb8d23925fb8ccbd3b2e3804fb0a312ee227610b", + "sha256": "1j696incblnqhz7yi8xmshiz2p5kp910288j513sj8rknlykpr4n" }, "stable": { "version": [ @@ -114567,11 +115503,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20230422, - 1801 + 20230730, + 1922 ], - "commit": "2fcf494fe5f3f292bb5dab180fe2dbfdcc75249e", - "sha256": "0msxvxy8vhv2i596k6g3y965f371s7p03hm02k457kv32xnxi335" + "commit": "b926f4a5891be2428489601b0de7e475dd1b697d", + "sha256": "0cyy5jnm767c5vavsjhds4ar2zfs8h8gvf3kkjmg4ip64qlmygw2" } }, { @@ -115081,14 +116017,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20230602, - 2121 + 20230723, + 1411 ], "deps": [ "compat" ], - "commit": "a1575e58331b1ff85ac97667df0130ae822ccf5f", - "sha256": "1aq4bb83pdkbkbqh6ba0r7sadaq45qqg2q5jlqyvsn8akcsq65iq" + "commit": "323d6b6c84e6ae55e578efa1efb6bb4d42a69cac", + "sha256": "1l5pjq3iq6hmlc2zc30zhcvdf5l07778fvkg4b6qw8q0rl3a6mi5" }, "stable": { "version": [ @@ -115129,11 +116065,11 @@ "repo": "haji-ali/transient-extras", "unstable": { "version": [ - 20230602, - 814 + 20230721, + 839 ], - "commit": "72eb0e66714d3144de55b983a23eca5c0b664fcc", - "sha256": "1dmgmqqgw30lpz973j0g49sgr4m1rjiv3446576gl7i9fa4r1mv3" + "commit": "ca0d5c597382615f0ee8300ff8718f54f8214359", + "sha256": "1g92pjrrwx2hzijn4wbm3xfmarirgjs7sq4k025vj4vdjdxvddq9" } }, { @@ -115555,26 +116491,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20230311, - 1456 + 20230705, + 525 ], "deps": [ "tree-sitter" ], - "commit": "ffe9ab0c8ec9e37e70e31d296df3b85bcfc73c5e", - "sha256": "0ip3bwl525f2lswf4dz6vbdvdlwhdkh86vxj3x3gvxkb3m2jaz8v" + "commit": "944a734b7c3a5922a7e9a2009a9165e2dc195b18", + "sha256": "1sn9rdmj4pndswqq19f0y9g5s2i8kbwvkg2azx0kmf9y269j6z2a" }, "stable": { "version": [ 0, 12, - 18 + 22 ], "deps": [ "tree-sitter" ], - "commit": "ffe9ab0c8ec9e37e70e31d296df3b85bcfc73c5e", - "sha256": "0ip3bwl525f2lswf4dz6vbdvdlwhdkh86vxj3x3gvxkb3m2jaz8v" + "commit": "944a734b7c3a5922a7e9a2009a9165e2dc195b18", + "sha256": "1sn9rdmj4pndswqq19f0y9g5s2i8kbwvkg2azx0kmf9y269j6z2a" } }, { @@ -115621,8 +116557,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230522, - 1925 + 20230719, + 2015 ], "deps": [ "ace-window", @@ -115634,8 +116570,8 @@ "pfuture", "s" ], - "commit": "f372f2cbfa443c97cb383c2b05a13cb13349cbb6", - "sha256": "0iyp51y6l4mjag9xfyw6d87p9b3cmca047gax76dajnn0n5shw2v" + "commit": "aa0944a29eee48302fd76b6c3a59c5aece114fa6", + "sha256": "09finy1y3jc72f5ar891bi2xsynd31g7pl8f27m2zbpc7r4la8mi" }, "stable": { "version": [ @@ -115755,16 +116691,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230703, + 1929 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "2fed6948fe2bc37f8539c5de232e5ccd4891800a", + "sha256": "0slc7b5xdgbdcl9sldiq23ch3nnmz60gqv8sj3vswxk435ajcyzg" }, "stable": { "version": [ @@ -115807,16 +116743,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230703, + 1929 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "2c576bebccd56ec8e65f4ec5ed5de864d9684fbf", + "sha256": "1if18rdzp1cw01mx3yy6wdn7iq0n9r0wp2h4inx74hpssrsidn2c" }, "stable": { "version": [ @@ -115840,16 +116776,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230703, + 1929 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "2c576bebccd56ec8e65f4ec5ed5de864d9684fbf", + "sha256": "1if18rdzp1cw01mx3yy6wdn7iq0n9r0wp2h4inx74hpssrsidn2c" }, "stable": { "version": [ @@ -115873,15 +116809,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230703, + 1929 ], "deps": [ "projectile", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "2fed6948fe2bc37f8539c5de232e5ccd4891800a", + "sha256": "0slc7b5xdgbdcl9sldiq23ch3nnmz60gqv8sj3vswxk435ajcyzg" }, "stable": { "version": [ @@ -115904,15 +116840,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230703, + 1929 ], "deps": [ "dash", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "2fed6948fe2bc37f8539c5de232e5ccd4891800a", + "sha256": "0slc7b5xdgbdcl9sldiq23ch3nnmz60gqv8sj3vswxk435ajcyzg" }, "stable": { "version": [ @@ -115935,11 +116871,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20230528, - 750 + 20230715, + 2154 ], - "commit": "298c49b48f36b230224421ff2f168734f74fce15", - "sha256": "0pn5ymcqvbp7248zz652igpvizvmqis7bgn6mwbd9w341hnj47kp" + "commit": "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e", + "sha256": "0crj4522rakbkhffr7hm1rgczcnd8ph0fzm2sz1qkc85680zy86h" }, "stable": { "version": [ @@ -116281,14 +117217,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20230513, - 1514 + 20230718, + 2055 ], "deps": [ "caml" ], - "commit": "e5d792009237c952c44cd9c59873dee9719f1280", - "sha256": "0i899i47h6kxhac6kalvjf202njia34h4fk8b4x4q5x4l4rxa2di" + "commit": "d484910213d6a241d72a651cb46b7de17dac1ad5", + "sha256": "1v34hng4nzmg0al3vwsypdz1spd4nvv4ckvhkp6k5cfmpd13ismn" }, "stable": { "version": [ @@ -116757,11 +117693,12 @@ }, "stable": { "version": [ - 4, + 0, + 5, 2 ], - "commit": "41f09ca6c203da93bdadb2077556efd48e3b5d5a", - "sha256": "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c" + "commit": "4b544f9b38fdfdaa956d3cf510c91573d6a96fd0", + "sha256": "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc" } }, { @@ -117071,11 +118008,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20230521, - 2351 + 20230703, + 2353 ], - "commit": "834f551117b52e9f8aac7d6908d75c56cd9a2cd4", - "sha256": "0z1hj5xjyza92y73wz2xyiwsx7j6mm46z24ixmmhzzdq48x8bknl" + "commit": "a6c4f73bc22401fd36e0f2fd4fe058bb28566d84", + "sha256": "03pb88bi5z4f01972jbk9z6w9iqamqflfp20mih29ghvbiyn6ahj" } }, { @@ -117994,6 +118931,25 @@ } }, { + "ename": "ushin-shapes", + "commit": "7ba7c7c0ce156e93fb3f00ad6f8a6f5b4f5d085d", + "sha256": "1nsvgl630qlfpkniharqdr7y4w2rzr62nwyssgny59k10bw72m5v", + "fetcher": "sourcehut", + "repo": "ushin/ushin-shapes.el", + "unstable": { + "version": [ + 20230702, + 2210 + ], + "deps": [ + "svg-lib", + "svg-tag-mode" + ], + "commit": "30171af499d8117a2dbc3e978473793eced49bcb", + "sha256": "1gxjj1f9jdh572sdfh60z3a056a4clzssbyx12kkh60vak5g0fg3" + } + }, + { "ename": "utimeclock", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "0ky8liapkw7ymv51pc8zhfd1bglv0izjifi79pjjpzh8cbxcd055", @@ -118016,26 +118972,26 @@ "repo": "diml/utop", "unstable": { "version": [ - 20230421, - 1019 + 20230707, + 1535 ], "deps": [ "tuareg" ], - "commit": "ba0e2c7fffab33cf78e2f6e4c346f65e7c0949ae", - "sha256": "12i5icvykgr6lsw00kdpdd65655p93fdi5pvcc2pnbi0s7l2savs" + "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", + "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" }, "stable": { "version": [ 2, - 12, + 13, 1 ], "deps": [ "tuareg" ], - "commit": "ba0e2c7fffab33cf78e2f6e4c346f65e7c0949ae", - "sha256": "12i5icvykgr6lsw00kdpdd65655p93fdi5pvcc2pnbi0s7l2savs" + "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", + "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" } }, { @@ -118099,11 +119055,11 @@ "repo": "non/uxntal-mode", "unstable": { "version": [ - 20230131, - 235 + 20230707, + 1623 ], - "commit": "aaaa7a7ac24eb142c68f691185166327ec1e4520", - "sha256": "1bba89vw937rzcm1lr2ym9kkyd56wkgpzhc7dxz73nh74wwh4mf5" + "commit": "0f0bb416d43a940ee7a057db075bf5804708dc5c", + "sha256": "0p1ig2wmldpiymz59gnz9yrrla58x8zyfpklj6rwdf37n6q64ykx" }, "stable": { "version": [ @@ -118501,15 +119457,6 @@ ], "commit": "b9c0109a8c77446980de668785e6af1e46bdcdcd", "sha256": "1jqgfk49295g8b0371s2dargncf05mcb5sv04j5xyfblrl5nm4pw" - }, - "stable": { - "version": [ - 0, - 4, - 4 - ], - "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1", - "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7" } }, { @@ -118543,14 +119490,14 @@ "repo": "justbur/emacs-vdiff", "unstable": { "version": [ - 20220830, - 1450 + 20230621, + 201 ], "deps": [ "hydra" ], - "commit": "d5df45f84395f507aba555a54407b60e284b23cd", - "sha256": "01xcl6f5d3d7nlmc0w4har9ms6crhkbbbm3xa1fnbyrgyfiyblgx" + "commit": "170e968c6a46a572b30c52c1b038232d418734cc", + "sha256": "0qbk1w395w6xxp24rv7rksghds7vfn33dls0l810pdpdi7lm9x53" }, "stable": { "version": [ @@ -118797,11 +119744,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230301, - 2117 + 20230711, + 1636 ], - "commit": "0fa5259eb7e9404a5d665fb3fdf3f2c19d043189", - "sha256": "030yxnlyky89v8n4j48dh1q1zcqdmlx2xm0lm2fq93y9hpr8s7b6" + "commit": "db122b8847b1c1896f3cf9512fd0ec9f79927715", + "sha256": "0srlbbih7flmbipmp1w21pc7440pca918n4n6ja1rwigsh3zz5cl" }, "stable": { "version": [ @@ -118858,8 +119805,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20230609, - 1745 + 20230627, + 1748 ], "deps": [ "ag", @@ -118875,8 +119822,8 @@ "verilog-mode", "yasnippet" ], - "commit": "bc04321c22d95c76132f758f12b6fbec9c376189", - "sha256": "1xc1wff3wamh3pa18zybd0szfaaj6hvs0l00xl7jn4r46d6yhikh" + "commit": "308c95d187e236972cad405d5251462c6a825809", + "sha256": "05pxf8bw6vs87rx891ndaajhysqmvvl55x27222h64h2cg9xhg0x" }, "stable": { "version": [ @@ -119063,8 +120010,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20230609, - 2131 + 20230618, + 1337 ], "deps": [ "ag", @@ -119075,8 +120022,8 @@ "lsp-mode", "ripgrep" ], - "commit": "231cb1a7dd582625035b8768e37f5bb9d25ff1b0", - "sha256": "1idf6cq42zf9slkhha1218hrz93jddp4f325lq76z283af34fpwl" + "commit": "4e2702723111f4a8cfc300ce502e6a177929f117", + "sha256": "1vrvfzgnd72914gq2k4qcvx7vk2vqsn5ywm3i10vvq8in6fvrp4p" }, "stable": { "version": [ @@ -119699,11 +120646,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20230527, - 2110 + 20230725, + 1703 ], - "commit": "0872229432258a94778c6d0dec11338b4cf2e9c7", - "sha256": "0rq1dapgyyzzb9xpanpax4d2vgg3021lbfk8mhcfhkr5q02rq1a0" + "commit": "65420ca73b543e1e7955905bea1a8d7e5fe6c5ff", + "sha256": "06wdyaiycxnmb6xgqv325413wl6017pr2z705hw78ddidjqlpi71" }, "stable": { "version": [ @@ -119881,8 +120828,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20221128, - 633 + 20230706, + 1130 ], "deps": [ "dash", @@ -119890,8 +120837,8 @@ "org-roam", "s" ], - "commit": "bee9bda6a17657155d233e375a2cae693fbe8676", - "sha256": "1j075p8716kfqd68rlfcax3rv8a2aggmz0m8hw3kic91q7psnb7m" + "commit": "de199a16e294056e2368a2e031b19008cf9f9e52", + "sha256": "0wxnp7hiqa58n5q2ff863w0nzp5ii5fmzh8z4674s5mgjcaj7149" }, "stable": { "version": [ @@ -119996,11 +120943,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20230324, - 125 + 20230801, + 18 ], - "commit": "f8819bca0c97970662cd4214f8f3104ab4a376c1", - "sha256": "1yk41h28cbi5qfh4jx173f83f73anf3imwfqary58yq159n47im8" + "commit": "1388eadc914bed79b0e06a6565388c5e8aff8014", + "sha256": "09l3mllq7p56r3srlfiyry4qgvpl5vijc63ccqpigdlzy758p8r1" } }, { @@ -120701,14 +121648,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20220312, - 2008 + 20230703, + 2141 ], "deps": [ "templatel" ], - "commit": "9daa6725919dfebaf6fbe19ed262231c2cbf9f89", - "sha256": "15dysmmhxa33lgilgd5pk0vd5snhdwjacns4z5dsrcp5mf4x1xqn" + "commit": "9af2294cc0e512b28d1248dd4ad8a0994458df3e", + "sha256": "0659869bz8gwsshb7ysnp1d5lcb965grbcz7vdd0xhyyvpxkjhxc" }, "stable": { "version": [ @@ -120763,20 +121710,20 @@ "repo": "xgqt/emacs-websearch", "unstable": { "version": [ - 20230210, - 1321 + 20230705, + 1639 ], - "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", - "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" + "commit": "5120cec3c36ddcdaceb5235c0b52eecbc3b37fcb", + "sha256": "0q6y2347w4mfshnxjvkk4vm0bmi24zpz7kc0irk0cl7hxa20025d" }, "stable": { "version": [ 2, 1, - 0 + 1 ], - "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", - "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" + "commit": "5120cec3c36ddcdaceb5235c0b52eecbc3b37fcb", + "sha256": "0q6y2347w4mfshnxjvkk4vm0bmi24zpz7kc0irk0cl7hxa20025d" } }, { @@ -120787,14 +121734,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20230305, - 410 + 20230730, + 517 ], "deps": [ "cl-lib" ], - "commit": "1a08093b122d8cf20366a1cba5faddf7a53d08ed", - "sha256": "0ji89vldf9axb34p0lwpwqb7x8qjgnk8c47k1gs71if8r1a76rph" + "commit": "a39ea953f27f6ae105ac5b1343852ddf13438048", + "sha256": "03g472k7nv0w10ap1z0vvjiwwfmxzkl8nfh6jpcsbvr2c0n8bb7h" }, "stable": { "version": [ @@ -120926,11 +121873,11 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20230519, - 437 + 20230805, + 1952 ], - "commit": "7202294447e3f6e894fe8a1ae88c96ca010ccccd", - "sha256": "01h4inrqy4qkb1p1flxqqxxbzp1vvl60l0lnzr3n3cs38xkcajz9" + "commit": "7b50001525b477a66e74bb1f749195d59f800872", + "sha256": "08sv0vy0niknwwgz95fdf1k5cd4mr0cmf9j752w54imjh047mj8b" } }, { @@ -121145,11 +122092,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20230330, - 2121 + 20230712, + 2151 ], - "commit": "bd34ede7bf77ad3988330b37207f3978e7342c79", - "sha256": "1ipnc1z0dyib4cn8jly0iiqa5b2im2bzxf67lkdckix74c9821ix" + "commit": "df6b0cb8449812e7fb200bc852107fa7eb708496", + "sha256": "140zf6cjr0gxfcy9pkhhj9bf3fqx9bkincg73w9a1sny411k58yx" }, "stable": { "version": [ @@ -121496,15 +122443,61 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20230317, - 2050 + 20230630, + 116 ], "deps": [ "org", "wikinfo" ], - "commit": "fe16cbecc73a41110f2bad95c1f63a97a9da88ca", - "sha256": "1hdn5dwzx9d9dj7k5la75j8k3nyq30ppxcjajg6jbylh3791sb06" + "commit": "525ab7d72ffbfbb57868f430a67cad010904ccf5", + "sha256": "0igzg5adbqcb2zz336d5fvn71l8jnjjsl0g4zzj12dh0sacc33py" + } + }, + { + "ename": "wildcharm-light-theme", + "commit": "5fb70dcc30a855be2d69bdece7a32c212a148162", + "sha256": "1hp8lcc4g1adarwwdc3qnns98w357wvmpzxl2kkm70d91ch5j5mw", + "fetcher": "github", + "repo": "habamax/wildcharm-theme", + "unstable": { + "version": [ + 20230805, + 1207 + ], + "commit": "eb518d68956494396bfad5effb6b0b5ff24a4a70", + "sha256": "0n6cyi46cqnm6azqc2744sscf1cxhpa1qrxi6n1xq3lvmpnrgnkh" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "00dee3a5e9d0db15bfa386a6e9ff74a62252adce", + "sha256": "0xrng2q9pc7ayrifsjcddjfh9vzzvgll6rm57as4hxgvj3qm52z0" + } + }, + { + "ename": "wildcharm-theme", + "commit": "5a6cc7aad7f35309b74737e13f121900d74b0bfa", + "sha256": "0xvy8fxfpszqhs4pxm7w7ks46r16l7b2f6harbw1k8z4j3c0ayqh", + "fetcher": "github", + "repo": "habamax/wildcharm-theme", + "unstable": { + "version": [ + 20230805, + 1207 + ], + "commit": "eb518d68956494396bfad5effb6b0b5ff24a4a70", + "sha256": "0n6cyi46cqnm6azqc2744sscf1cxhpa1qrxi6n1xq3lvmpnrgnkh" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "00dee3a5e9d0db15bfa386a6e9ff74a62252adce", + "sha256": "0xrng2q9pc7ayrifsjcddjfh9vzzvgll6rm57as4hxgvj3qm52z0" } }, { @@ -121925,14 +122918,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20230608, - 1237 + 20230711, + 1217 ], "deps": [ "compat" ], - "commit": "9e437353ee817b8e6a9ffce53e37fe5a6fcb4294", - "sha256": "08d9pki6rq93nrzqf43aih0fqzxh3xngxfbqwh2j6yq8lgjvjmrn" + "commit": "a4853781835346aabf083d2d9cb87f656d01ccac", + "sha256": "19cw4swz2v9wyy54fffnh8vdyb8irzqmd3wzgzfbk3kiksapk7ns" }, "stable": { "version": [ @@ -122242,11 +123235,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20230608, - 1304 + 20230710, + 1203 ], - "commit": "10f29c530c5f7584dc524111689f98a2a6a63f12", - "sha256": "18db1m80nwwgzhp7mpqyi18n71knhv62qdhmahvdpgz6dnqx6mjk" + "commit": "00e563c3b5f1634c8f43516d0e5a9674db7b6099", + "sha256": "1jp6dila2vjglicm9v72jb4zvsvr3q83irb7aaawv6sfal56676a" } }, { @@ -122800,11 +123793,11 @@ "repo": "dkogan/xcscope.el", "unstable": { "version": [ - 20210719, - 828 + 20230626, + 2109 ], - "commit": "d228d7593d762e457340f678d14b663ef66d7cee", - "sha256": "0pr85ywp585imjzswm04647nb4iqqvg8jgmbcs5210qmr9kh0z8d" + "commit": "2f35b26428dd82c016941744f03aad97df80c47b", + "sha256": "12gj38dwlsfmaf2zdz28y4l0vbvpc8r4py8w18m2n6i9pafrlwcg" }, "stable": { "version": [ @@ -123499,11 +124492,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20230312, - 250 + 20230714, + 154 ], - "commit": "a19fbf948a945571300e5a20ff1dbfa6ecfa0d16", - "sha256": "05ps0lsapi0xymkyvqwnxhgkp6qzbfz1xpgq6s9d6g0ycc2fbmcm" + "commit": "ee86566af1ed4975531ab3aa4eb4dba770c227f6", + "sha256": "19xzh8jmax6y1dhzhmbhkfcx81g9rgyljni4d3443s26xh9dm2kq" }, "stable": { "version": [ @@ -123553,11 +124546,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20230329, - 723 + 20230714, + 440 ], - "commit": "b153150e0e77b4ec462d741cdb16956c6ae270d6", - "sha256": "0gdwicbskmz9xfcy0q3wwy7y7fx5dkdn50v9lcp3xxgy5f2s1h4v" + "commit": "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91", + "sha256": "09im8s8chwa59xag30zk3qlrc1dx9hxngp0z4wrj84mf1yyg1wxp" }, "stable": { "version": [ @@ -123844,14 +124837,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20230314, - 2056 + 20230622, + 1323 ], "deps": [ "yasnippet" ], - "commit": "8e4c521252501dd9ad71ea78fae14683ab7a14cb", - "sha256": "1c22vq5i758n9rqd4nfs8qmy4issphl1gv7hiw5k47f1y5j07dgc" + "commit": "bec49fa129ae8c0104ba150f9b8352a39c54dbd6", + "sha256": "14pwcs4qc3xfsxbjbi0518hnzp531i4m2h4ia75v9kibjfrk48x0" }, "stable": { "version": [ @@ -124024,6 +125017,30 @@ } }, { + "ename": "yeetube", + "commit": "857cc1f2e5c2c8dce454ff1c37cc50a944857dfd", + "sha256": "17m8ln1k2r94n40i6h84nghl97bqvh9p29jc1pf43b934c8jkn7k", + "fetcher": "sourcehut", + "repo": "thanosapollo/yeetube.el", + "unstable": { + "version": [ + 20230804, + 1322 + ], + "commit": "2364a3e120b461fc6f5fbbf91cd0ab1ae805be15", + "sha256": "0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03" + }, + "stable": { + "version": [ + 1, + 4, + 2 + ], + "commit": "2364a3e120b461fc6f5fbbf91cd0ab1ae805be15", + "sha256": "0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03" + } + }, + { "ename": "yequake", "commit": "194968f221b2f60042a3684e1ca3e1c18adbde8e", "sha256": "1ps5r6k2903w9qbr3aszw3l3mgcg2zlnxlzbak99314if5k6aiak", @@ -124103,10 +125120,10 @@ }, { "ename": "ynab", - "commit": "20a365e48ed200afadae01c096d1ea669e9c1938", - "sha256": "0in7blx21kv01vbwkrmvcl4n07vm4wmxkbv3l78s9xrri66i3nvf", + "commit": "5c5e5994ae49ce92bf059c27dedab6d6b2d20a5a", + "sha256": "1sm5jf3ydh2zbs2x8fjlv1xvidxnbpwpgyr0fxgsl160ssdp5k06", "fetcher": "github", - "repo": "janders223/ynab.el", + "repo": "thoreinstein/ynab.el", "unstable": { "version": [ 20200607, @@ -124143,20 +125160,20 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20230225, - 740 + 20230801, + 1741 ], - "commit": "ba9427329ac49fa2e060da2c16507feed62ad890", - "sha256": "0f57qz8fxn4bncmd8ak9n0s8h4b0kba7nfmkb475djlhn2n2xxl9" + "commit": "61e4250ae32744e5434c8faef7d059c7b157f81a", + "sha256": "0l6lcf7k8wwsda9igzmf9fcd3fxmb2cbhv07jglmx4g8d1n8zcc6" }, "stable": { "version": [ - 6, - 2, + 7, + 0, 0 ], - "commit": "70365870ff823b954aa85972217d8f116c45d939", - "sha256": "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn" + "commit": "11c37ef4ef68b55c7ce8ad058abb0b678411b299", + "sha256": "0qv3cwr9f0dip4wlxc1imcis66nk306sbp5gm1mx2fpmp3zb3z9x" } }, { @@ -124816,14 +125833,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20230307, - 1215 + 20230722, + 2023 ], "deps": [ "reformatter" ], - "commit": "2013d39ee9a62449263939bc8c33a128fe1e90f0", - "sha256": "1mmrl2vjkqmhagv4fkjb11m4pba2imzgxjgk7zlg0hmxw27d37i1" + "commit": "0ced3ffb6d76c906c62d7f8f97272aa577fb0c3a", + "sha256": "0sqh4a1yzvqfjs72blcshaqlqs2qxmk1yx25h9xl3iqaajns883z" } }, { @@ -124874,11 +125891,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230609, - 742 + 20230712, + 1103 ], - "commit": "6ba90de2b33a8717fb1e263fe6df7b3831d3bd8e", - "sha256": "1hihanix3jklpcfxyfl2hs58q4z2hqsgavk7bf3zq0x4g3sd9k8m" + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" }, "stable": { "version": [ @@ -124916,14 +125933,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230505, - 2118 + 20230709, + 1112 ], "deps": [ "zk" ], - "commit": "b9f5433486e79a23e82035be3e10d8f5678b2880", - "sha256": "1n5n4p24ymxhhs60g2nqzslhwjbg3pmg94cz7pc6pq48rb2wicq5" + "commit": "91f1d4a3ad29e06d97d9a5fa3a4d1e6705ca828c", + "sha256": "15q51bcprv3pgy0sapkvf90as0my8jck720nz1hm3lqa1ibb1xz0" }, "stable": { "version": [ @@ -125453,9 +126470,9 @@ }, { "ename": "ztree", - "commit": "f151e057c05407748991f23c021e94c178b87248", - "sha256": "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20", - "fetcher": "github", + "commit": "71e05553c92d5a92d0e57a7637c86ee16f498241", + "sha256": "0ih1p3zwbrp388hmv410y12316dya2jdra76mbzi3qcy0z30nd7b", + "fetcher": "codeberg", "repo": "fourier/ztree", "unstable": { "version": [ @@ -125516,14 +126533,14 @@ "repo": "mrkkrp/zzz-to-char", "unstable": { "version": [ - 20230606, - 1641 + 20230704, + 1306 ], "deps": [ "avy" ], - "commit": "3bc8e0b3b34f511be2ae663785e3cad758361ba2", - "sha256": "0vwqr6h3bp9sjgjkyxm351xmkm47939ky04y8jdlh4g61mjv7mr9" + "commit": "5945432d74feb2d1cd3520b185b3ab5dca35e0eb", + "sha256": "00kilm0m3v6rwbynf7y23011ac0s6jdh2xf71wzrp1577k4v9s5p" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index 509eee06e2be4..3b73e0843d92a 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -23,10 +23,10 @@ let docbook2x docbook-xsl-nons wrapGAppsHook + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection vala gtk-doc ]; }); @@ -50,10 +50,10 @@ let python3 glib wrapGAppsHook + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection vala gtk-doc gst_all_1.gstreamer diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock b/pkgs/applications/editors/neovim/neovide/Cargo.lock deleted file mode 100644 index febaea9c1637b..0000000000000 --- a/pkgs/applications/editors/neovim/neovide/Cargo.lock +++ /dev/null @@ -1,3321 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.9", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "andrew" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" -dependencies = [ - "bitflags", - "rusttype", - "walkdir", - "xdg", - "xml-rs", -] - -[[package]] -name = "android_glue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" - -[[package]] -name = "anstream" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" - -[[package]] -name = "anstyle-parse" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-wincon" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" -dependencies = [ - "anstyle", - "windows-sys 0.45.0", -] - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bindgen" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap 3.2.23", - "env_logger", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "calloop" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" -dependencies = [ - "log", - "nix 0.18.0", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading 0.7.4", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "strsim 0.10.0", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex 0.4.1", - "once_cell", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "clipboard-win" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" -dependencies = [ - "lazy-bytes-cast", - "winapi", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - -[[package]] -name = "copypasta" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172" -dependencies = [ - "clipboard-win", - "objc", - "objc-foundation", - "objc_id", - "smithay-clipboard", - "x11-clipboard", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys 0.8.4", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", - "libc", -] - -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "phf", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -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 = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.7", -] - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.48.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c76a80dd14a27fc3d8bc696502132cb52b3f227256fd8601166c3a35e45f409" -dependencies = [ - "glob", - "lazy_static", - "log", - "rustversion", - "thiserror", - "time", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", - "tokio-io", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "gl" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404" -dependencies = [ - "gl_generator", -] - -[[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 = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "glutin" -version = "0.26.0" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" -dependencies = [ - "android_glue", - "cgl", - "cocoa", - "core-foundation 0.9.3", - "glutin_egl_sys", - "glutin_emscripten_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "lazy_static", - "libloading 0.7.4", - "log", - "objc", - "osmesa-sys", - "parking_lot 0.11.2", - "wayland-client 0.28.6", - "wayland-egl", - "winapi", - "winit", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.1.5" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" -dependencies = [ - "gl_generator", - "winapi", -] - -[[package]] -name = "glutin_emscripten_sys" -version = "0.1.1" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" - -[[package]] -name = "glutin_gles2_sys" -version = "0.1.5" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" -dependencies = [ - "gl_generator", - "objc", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.1.7" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.1.5" -source = "git+https://github.com/neovide/glutin?branch=new-keyboard-all#7c313d91584492961b9efab0d611e35b977c0fea" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "lazy-bytes-cast" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "mio-misc" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c" -dependencies = [ - "crossbeam", - "crossbeam-queue", - "log", - "mio 0.7.14", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if 1.0.0", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "nameof" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce8b389a86cabeb0d8b33a61e60f3cbb4de38914342fe274e69111f3b5d9c44" - -[[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - -[[package]] -name = "neovide" -version = "0.10.4" -dependencies = [ - "async-trait", - "backtrace", - "cfg-if 1.0.0", - "clap 4.2.1", - "cocoa", - "copypasta", - "csscolorparser", - "derive-new", - "dirs", - "euclid", - "flexi_logger", - "futures 0.3.28", - "gl", - "glutin", - "image", - "itertools", - "lazy_static", - "log", - "lru", - "mockall", - "neovide-derive", - "nvim-rs", - "objc", - "parking_lot 0.12.1", - "pin-project", - "rand 0.8.5", - "rmpv", - "serde", - "serde_json", - "shlex", - "skia-safe", - "swash", - "time", - "tokio", - "tokio-util", - "unicode-segmentation", - "which", - "winapi", - "winit", - "winres", - "xdg", -] - -[[package]] -name = "neovide-derive" -version = "0.1.0" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "nix" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[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 = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "nvim-rs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e98dcbd3b0ece3cf2b76ebc1e33e6511777ea7322884f4b7150cbc253afa37e" -dependencies = [ - "async-trait", - "futures 0.3.28", - "log", - "parity-tokio-ipc", - "rmp", - "rmpv", - "tokio", - "tokio-util", -] - -[[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_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "osmesa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -dependencies = [ - "shared_library", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.28", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmpv" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754" -dependencies = [ - "num-traits", - "rmp", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.37.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rusttype" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "serde" -version = "1.0.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "serde_json" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "skia-bindings" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f249be649ae13f65934370168f742a7be27096f432f15572fb70f5367916b8f" -dependencies = [ - "bindgen", - "cc", - "flate2", - "heck", - "lazy_static", - "regex", - "serde_json", - "tar", - "toml", - "ureq", -] - -[[package]] -name = "skia-safe" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5036fc8c167b0e1886aba4f924781d8589e67e5f43bfc3af09d5c9eda4d21940" -dependencies = [ - "bitflags", - "lazy_static", - "skia-bindings", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smithay-client-toolkit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" -dependencies = [ - "andrew", - "bitflags", - "calloop", - "dlib 0.4.2", - "lazy_static", - "log", - "memmap2 0.1.0", - "nix 0.18.0", - "wayland-client 0.28.6", - "wayland-cursor 0.28.6", - "wayland-protocols 0.28.6", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags", - "dlib 0.5.0", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client 0.29.5", - "wayland-cursor 0.29.5", - "wayland-protocols 0.29.5", -] - -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit 0.16.0", - "wayland-client 0.29.5", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "swash" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb18e5888a9b5f0a89ea3ebdf6883dc479347ca9183b6c51a8f9cf2041f23a0" -dependencies = [ - "yazi", - "zeno", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[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.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "bytes 1.4.0", - "libc", - "mio 0.8.6", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.45.0", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - -[[package]] -name = "tokio-macros" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes 1.4.0", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "url", - "webpki", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wayland-client" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.20.0", - "scoped-tls", - "wayland-commons 0.28.6", - "wayland-scanner 0.28.6", - "wayland-sys 0.28.6", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons 0.29.5", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-commons" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" -dependencies = [ - "nix 0.20.0", - "once_cell", - "smallvec", - "wayland-sys 0.28.6", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-cursor" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" -dependencies = [ - "nix 0.20.0", - "wayland-client 0.28.6", - "xcursor", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client 0.29.5", - "xcursor", -] - -[[package]] -name = "wayland-egl" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956" -dependencies = [ - "wayland-client 0.28.6", - "wayland-sys 0.28.6", -] - -[[package]] -name = "wayland-protocols" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" -dependencies = [ - "bitflags", - "wayland-client 0.28.6", - "wayland-commons 0.28.6", - "wayland-scanner 0.28.6", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags", - "wayland-client 0.29.5", - "wayland-commons 0.29.5", - "wayland-scanner 0.29.5", -] - -[[package]] -name = "wayland-scanner" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" -dependencies = [ - "dlib 0.5.0", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib 0.5.0", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.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.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winit" -version = "0.24.0" -source = "git+https://github.com/neovide/winit?branch=new-keyboard-all#27967af60d408218529255e897964b6cffd94659" -dependencies = [ - "bitflags", - "cocoa", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "memmap2 0.2.3", - "mio 0.7.14", - "mio-misc", - "nameof", - "ndk", - "ndk-glue", - "ndk-sys", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.3.4", - "scopeguard", - "serde", - "smithay-client-toolkit 0.12.3", - "unicode-segmentation", - "wayland-client 0.28.6", - "winapi", - "x11-dl", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] - -[[package]] -name = "x11-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" -dependencies = [ - "x11rb", -] - -[[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.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname", - "nix 0.24.3", - "winapi", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xdg" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.1.0" -source = "git+https://github.com/maroider/xkbcommon-dl?rev=900832888ad6f11011d1369befb344a9aa8a9610#900832888ad6f11011d1369befb344a9aa8a9610" -dependencies = [ - "bitflags", - "dlib 0.5.0", - "lazy_static", - "log", - "x11-dl", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "yazi" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03b3e19c937b5b9bd8e52b1c88f30cce5c0d33d676cf174866175bb794ff658" - -[[package]] -name = "zeno" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index d14181d26d143..345faf4afc001 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,23 +25,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-0vIq8vJPvcmA7hRyGY4qQRxwmgQAKHVU+452iMohGCA="; + sha256 = "sha256-OIAGqr34QcpYVUTcW+aPoGeBez/VuT6sSFC5JQaodOI="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "glutin-0.26.0" = "sha256-Ie4Jb3wCMZSmF1MUzkLG2TqsLrXXzzi6ATjzCjevZBc="; - "winit-0.24.0" = "sha256-p/eAaDVmTHzfZ+0DiBA/9v06Z5o1dXVNoCgWRqC1ed0="; - "xkbcommon-dl-0.1.0" = "sha256-ojokJF7ivN8JpXo+JAfX3kUOeXneNek7pzIy8D1n4oU="; - }; - }; + cargoSha256 = "sha256-SMix6lKBkje0o+SxTK7AVSd+QbUyTlu4yPZ3bxnpggg="; SKIA_SOURCE_DIR = let @@ -49,8 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m103-0.51.1"; - sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw="; + rev = "m113-0.61.8"; + sha256 = "sha256-xGfkc1JLBGQW4WcblFyluZ2paEuisCVPNDU4Rfkv3BE="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index e7ee3fc53a532..82730f5458a3c 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -1,8 +1,8 @@ { "expat": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "a28238bdeebc087071777001245df1876a11f5ee", - "sha256": "sha256-TSaVtKEk7J0fckDvpI6/U5Aq7d37nsixp0Ft7sMHi8w=" + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "sha256": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=" }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", @@ -21,17 +21,17 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc", - "sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E=" + "rev": "09a266236147497bd8149240062c31c16fbc81e3", + "sha256": "sha256-NLydUJI15zRBFFDc7VRDXjgc0AwS3l6GMt2usMWOSG4=" + }, + "wuffs": { + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "a0041ac0310b3156b963e2f2bea09245f25ec073", + "sha256": "sha256-obRMrrKY3rPdFwQNa5IplpuKqiodHvRC8jbIOjp7R2w=" }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" - }, - "libgifcodec": { - "url": "https://skia.googlesource.com/libgifcodec", - "rev": "fd59fa92a0c86788dcdd84d091e1ce81eda06a77", - "sha256": "sha256-spyZU4QhV2xrHcBRoYqYgCR0wEM5lgfhGh8pqJE5yXM=" } } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 356b4ed7c9c25..dbf95e35dd35b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1075,9 +1075,8 @@ self: super: { svedbackend = stdenv.mkDerivation { name = "svedbackend-${super.sved.name}"; inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ - gobject-introspection glib (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) ]; diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 0fcfa61907a7e..ef28d8cea340c 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -49,7 +49,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gtk3 - gobject-introspection libhandy librsvg ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index ee466865ef026..8145d05b9a715 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -8,20 +8,35 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.0.1"; + version = "2.1"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-0GOX77vZ4KZkvwnR1vlv52tlbR+ciwl3ycxbOIcDOqU="; + hash = "sha256-qkM/7auZ9TMF2r8KLnitxmvlyPmIjh7q9Ugh+QKh8hw="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.0-support-1.patch"; + url = "https://github.com/BestImageViewer/geeqie/commit/c45cca777aa3477eaf297db99f337e18d9683c61.patch"; + hash = "sha256-YiFzAj3G3Z2w7p+8zZlDBjWqUqnfSqvaxMkESfPFdzc="; + }) + (fetchpatch { + name = "exiv2-0.28.0-support-2.patch"; + url = "https://github.com/BestImageViewer/geeqie/commit/b04f7cd0546976dc4f7ea440648ac0eedd8df3ce.patch"; + hash = "sha256-V0ZOHbAZOrhLcNN+Al1/kvxvbw0vc/R7r99CegjuBQg="; + }) + (fetchpatch { + name = "fix-compilation-with-lua.patch"; + url = "https://github.com/BestImageViewer/geeqie/commit/a132645ee87e612217ac955b227cad04f21a5722.patch"; + hash = "sha256-BozarBPoIKxZS3qpjuzHHAWZGIWZAwvJyqsNC8v+TMk="; + }) + ]; + postPatch = '' patchShebangs . - # libtiff detection is broken and looks for liblibtiff... - # fixed upstream, to remove for 2.1 - substituteInPlace meson.build --replace 'libtiff' 'tiff' ''; nativeBuildInputs = diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index ecb09e539b3e4..603d14b31dcfc 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -49,6 +49,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; }) + + # Fix build with exiv2 0.28, can be removed on next update + # https://gitlab.gnome.org/GNOME/gthumb/-/issues/282 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch"; + sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix index 1f6e20f465a25..89887c9f4e870 100644 --- a/pkgs/applications/graphics/imgp/default.nix +++ b/pkgs/applications/graphics/imgp/default.nix @@ -11,6 +11,11 @@ buildPythonApplication rec { sha256 = "1miabaxd5pwxn0va4drzj1d4ppxvyqsrrd4xw1j6qr52yci0lms8"; }; + postPatch = '' + substituteInPlace imgp \ + --replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS" + ''; + propagatedBuildInputs = [ pillow ]; installFlags = [ diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index b444841f8f72d..48ef9fc8c010c 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -47,7 +47,6 @@ python3.pkgs.buildPythonApplication rec { libadwaita libnotify webkitgtk_6_0 - gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 9e516f211069d..1c473d2c41f66 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { intltool itstool libxml2 + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection goocanvas2 gtkspell3 isocodes diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index b283a6d4083fc..490a89b30b862 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -26,6 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { nativeBuildInputs = [ file intltool + gobject-introspection ]; # Package has no generally usable unit tests. @@ -37,13 +38,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { $out/bin/rapid-photo-downloader --detailed-version ''; - # NOTE: Without gobject-introspection in buildInputs and strictDeps = false, - # launching fails with: - # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ gdk-pixbuf gexiv2 - gobject-introspection gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -54,6 +51,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec { udisks ]; + # NOTE: Check if strictDeps can be renabled + # at the time of writing this the dependency easygui fails to build + # launching fails with: + # "Namespace [Notify / GExiv2 / GUdev] not available" strictDeps = false; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index d811540e58944..ef91009391b7e 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec { pkg-config makeWrapper wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -106,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: rec { cairo.dev dblatex gnumake - gobject-introspection graphicsmagick gsettings-desktop-schemas gtk3 diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 833ecd32788d5..2825b371e06da 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 atk - gobject-introspection libhandy libnotify pango diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index a1430a8b5e396..d8f8932fd7348 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -59,8 +59,6 @@ buildPythonApplication rec { buildInputs = [ atk gdk-pixbuf - # Needed to detect namespaces - gobject-introspection gst-plugins-good libhandy networkmanager diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index 82d7267b047a2..b8e57bd84b952 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk4 libadwaita libnotify diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index be2fcdbe4a718..519f12490f18a 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base libsoup_3 diff --git a/pkgs/applications/misc/diebahn/Cargo.lock b/pkgs/applications/misc/diebahn/Cargo.lock new file mode 100644 index 0000000000000..0a67c943da125 --- /dev/null +++ b/pkgs/applications/misc/diebahn/Cargo.lock @@ -0,0 +1,1916 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "async-trait" +version = "0.1.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.5", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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 = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cairo-rs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-expr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "chrono-tz" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[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 = "cxx" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.5", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.5", +] + +[[package]] +name = "diebahn" +version = "1.5.0" +dependencies = [ + "chrono", + "env_logger", + "gdk4", + "gettext-rs", + "gtk4", + "hafas-rs", + "libadwaita", + "log", + "once_cell", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "field-offset" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures-channel" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" + +[[package]] +name = "futures-executor" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-macro" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "futures-task" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" + +[[package]] +name = "futures-util" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gio" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" +dependencies = [ + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "once_cell", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e21acdeb9a02b8cba83e65afbb8aa45f977785e50f1113407024c6b6256988" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hafas-rs" +version = "0.1.0" +source = "git+https://gitlab.com/Schmiddiii/hafas-rs?rev=494fa671ca9ec1bfd1118c695a7dedf500c2b88a#494fa671ca9ec1bfd1118c695a7dedf500c2b88a" +dependencies = [ + "async-trait", + "chrono", + "chrono-tz", + "hex", + "hyper", + "hyper-rustls", + "log", + "md-5", + "serde", + "serde_json", + "serde_repr", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +dependencies = [ + "http", + "hyper", + "log", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libadwaita" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +dependencies = [ + "bitflags", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "once_cell", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[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_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "pango" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +dependencies = [ + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", + "uncased", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "regex" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.5", +] + +[[package]] +name = "serde_json" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.5", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c2d1c76a26822187a1fbb5964e3fff108bc208f02e820ab9dac1234f6b388a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.5", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "tokio" +version = "1.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +dependencies = [ + "autocfg", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.45.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "uncased" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[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.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "winnow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +dependencies = [ + "memchr", +] diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix new file mode 100644 index 0000000000000..a90dddb3162f0 --- /dev/null +++ b/pkgs/applications/misc/diebahn/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, cargo +, desktop-file-utils +, meson +, ninja +, pkg-config +, rustPlatform +, rustc +, wrapGAppsHook4 +, cairo +, gdk-pixbuf +, glib +, gtk4 +, libadwaita +, pango +, darwin +}: + +stdenv.mkDerivation rec { + pname = "diebahn"; + version = "1.5.0"; + + src = fetchFromGitLab { + owner = "schmiddi-on-mobile"; + repo = "diebahn"; + rev = version; + hash = "sha256-WEjMtRXRmcbgCIQNJRlGYGQhem9W8nb/lsjft0oWxAk="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "hafas-rs-0.1.0" = "sha256-9YmWiief8Nux1ZkPTZjzer/qKAa5hORVn8HngMtKDxM="; + }; + }; + + nativeBuildInputs = [ + cargo + desktop-file-utils + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = { + description = "GTK4 frontend for the travel information of the german railway"; + homepage = "https://gitlab.com/schmiddi-on-mobile/diebahn"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 4771cebc3411d..8c8f4a1c94670 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -103,15 +103,21 @@ in mkDerivation rec { cp src/hidapi/libusb/.libs/*.so* $out/lib cp src/univalue/.libs/*.so* $out/lib - # [RPATH][patchelf] Avoid forbidden reference error - rm -rf $PWD - # Provide udev rules as documented in https://digitalbitbox.com/start_linux mkdir -p "$out/etc/udev/rules.d" ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} ''; + # remove forbidden references to $TMPDIR + preFixup = '' + for f in "$out"/{bin,lib}/*; do + if [ -f "$f" ] && isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 9424ceeee51fe..173afec4aa603 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -12,8 +12,8 @@ in buildPythonApplication rec { version = "5.1.4"; pname = "gramps"; - nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; - buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] + nativeBuildInputs = [ wrapGAppsHook intltool gettext gobject-introspection ]; + buildInputs = [ gtk3 pango gexiv2 ] # Map support ++ lib.optionals enableOSM [ osm-gps-map glib-networking ] # Graphviz support diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index bb4c52882761c..fb3489893be3a 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -22,6 +22,7 @@ let inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; + disabledTests = [ "test_bytes_args" ]; }); }; }; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f4cf6e6d0e540..cdf75cb75cc13 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.116.1"; + version = "0.117.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YACMkfDdcou+Yve3D/ealaku1pzuWxInDtnhL/Y+cWw="; + hash = "sha256-WxYTlEqTWY78lHd+qEvmbRmbC6Ewph9U84SjvrlqgtY="; }; - vendorHash = "sha256-l7XCCsJbqZ4g1U8G3VMVArMofPgchUP0T7wGF57d4rA="; + vendorHash = "sha256-yjARpHewjCm2W/08xu7O/PlE9jIOgYmunEyGEfTHNQs="; doCheck = false; diff --git a/pkgs/applications/misc/johnny/default.nix b/pkgs/applications/misc/johnny/default.nix new file mode 100644 index 0000000000000..0f1530afb50c3 --- /dev/null +++ b/pkgs/applications/misc/johnny/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchFromGitHub, qt5, john, makeWrapper, makeDesktopItem +, copyDesktopItems }: + +stdenv.mkDerivation rec { + pname = "johnny"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "openwall"; + repo = "johnny"; + rev = "v${version}"; + hash = "sha256-fwRvyQbRO63iVt9AHlfl+Cv4NRFQmyVsZUQLxmzGjAY="; + }; + + buildInputs = [ john qt5.qtbase ]; + nativeBuildInputs = + [ makeWrapper copyDesktopItems qt5.wrapQtAppsHook qt5.qmake ]; + + installPhase = '' + install -D ${pname} $out/bin/${pname} + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ john ]} + install -D README $out/share/doc/${pname}/README + install -D LICENSE $out/share/licenses/${pname}/LICENSE + install -D resources/icons/${pname}_128.png $out/share/pixmaps/${pname}.png + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Johnny"; + desktopName = "Johnny"; + comment = "A GUI for John the Ripper"; + icon = pname; + exec = pname; + terminal = false; + categories = [ "Application" "System" ]; + startupNotify = true; + }) + ]; + + meta = with lib; { + homepage = "https://openwall.info/wiki/john/johnny"; + description = "Open Source GUI frontend for John the Ripper"; + license = licenses.bsd2; + maintainers = with maintainers; [ Misaka13514 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index ccf56da05a24b..436891482f19b 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook gobject-introspection ]; buildInputs = [ - glib glib-networking gobject-introspection gtk3 json-glib libgee libhandy + glib glib-networking gtk3 json-glib libgee libhandy libsoup ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 23edd6e2742f8..ad2850910cb7a 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -22,8 +22,8 @@ buildGoModule rec { vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; - buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ cairo gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; doCheck = false; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index d74a639a4e9ca..fffc7d4419530 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -80,13 +80,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-T0kK9JaaX8+hUxsnG/TftGPHWwkhPDx4nqGrplmIiI0="; + hash = "sha256-DSngV8nWHNqfPEBIfGq3HQeC1p9s6Q+GX+LcJiAiS4E="; }; propagatedBuildInputs = with self; [ diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 74efc4c1db020..3bfe95c090828 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -103,6 +103,7 @@ let inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; + disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); # Now requires `lingua` as check input that requires a newer `click`, # however `click-7` is needed by the older flask we need here. Since it's just diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 10bb6a782707b..70d30ea054e61 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -33,6 +33,7 @@ let pkg-config wrapGAppsHook wrapPython + gobject-introspection ]; configureFlags = [ @@ -47,7 +48,6 @@ let ]; buildInputs = [ - gobject-introspection gtk3 python ] ++ lib.optional withRandr libxcb diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix index 0f4f39d74c999..dccd5dc89c69a 100644 --- a/pkgs/applications/misc/shipments/default.nix +++ b/pkgs/applications/misc/shipments/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libhandy (python3.withPackages (ps: with ps; [ diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 24d0253aaf84f..520f4330e5037 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { python3 desktop-file-utils gtk3 + gobject-introspection ]; buildInputs = [ gtk3 python3.pkgs.gatt - gobject-introspection ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index c1a77d634d353..d347bb3af57f8 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ - gobject-introspection gtk3 gtksourceview4 # webkitgkt is used for rendering interactive statistics graph which diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 06cb31798215a..57dafc0e3ba02 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gobject-introspection cinnamon.xapp gspell ]; diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index ce5672337be03..babd312d3edde 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ accountsservice dbus glib - gobject-introspection gsettings-desktop-schemas gtk-layer-shell gtk3 diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 641723016a8a6..1b26f455649a3 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -34,9 +34,10 @@ python3Packages.buildPythonApplication rec { pkg-config meson ninja appstream-glib desktop-file-utils wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gtk3 gobject-introspection + gtk3 glib ]; nativeCheckInputs = with python3Packages; [ flake8 pytest ]; diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index d91d8c3ecb30d..9050655d4fa3a 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-gSHJkMyRgJ58kccQAh1bJNveirDaqGjlhrzgvEX5c8o="; + hash = "sha256-u/vpS9BQxeKd8eaJicmn2wMk9EYjCO7LXdoshCBa4rw="; }; - vendorHash = "sha256-umtBvcfQoMQdWmQIAReeOkhRq+pelZzPvFsTq5ZwPXU="; + vendorHash = "sha256-m6hPj1IZr+jEA/h2qbz03tuVq3aPEMmcnWiEC0LKtxI="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index da6d7b48696ac..db6ab6d6a90db 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gexiv2 - gobject-introspection gtk3 hicolor-icon-theme libnotify diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 0a6662c39a9f0..c9bb4131c5b81 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook jinja2 + gobject-introspection ]; buildInputs = [ @@ -62,7 +63,6 @@ stdenv.mkDerivation rec { libSM libXScrnSaver libXtst - gobject-introspection glib glibmm gtkmm3 diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 7cdd76e52fdec..914bfec7fad4f 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -5,6 +5,7 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, fetchpatch # re-add javascript support when upstream supports modern spidermonkey }: @@ -22,6 +23,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-u6QGhfi+uWeIzSUFuYHAH3Xu0Fky0yw2h4NOKgYFLsM="; }; + patches = [ + # Fix build bug with perl 5.38.0. Backport of https://github.com/rkd77/elinks/pull/243 by gentoo: + # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869"; + hash = "sha256-bHP9bc/l7VEw7oXlkSUQhhuq8rT2QTahh9SM7ZJgK5w="; + }) + ]; + buildInputs = [ ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 89f02114f42dc..0508b4a19ef38 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -28,7 +28,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = with gst_all_1; [ glib-networking - gobject-introspection gst-libav gst-plugins-base gst-plugins-ugly diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ebd837acb8247..3c3958f666132 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -454,22 +454,22 @@ "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0=" }, "google": { - "hash": "sha256-6VLZW6RlBW7D4GS/JTvlpIcF3AhIEKbNFOqsQI58HyE=", + "hash": "sha256-vhWtIJ5hKe/8a7N5Qxs8CQuSNlZEF3gdRzSqZiFqhVg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.76.0", + "rev": "v4.77.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8=" }, "google-beta": { - "hash": "sha256-ecmCr1AHpyYDmt1ofjFgJjirsNhpcdLggp9EXz3hT5E=", + "hash": "sha256-nfgoGYBAW5VdgMm2gkI2Ff5NlY2CAwuFjckN7xgGtcI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.76.0", + "rev": "v4.77.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8=" }, @@ -1061,13 +1061,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-8Pwy/jSzPWGXRCY+MszDPpbPWL6FFleoiu4VtSle0Kg=", + "hash": "sha256-eZiWhMtsrys64NjN12BDaxL2b2GynIJMhWe+D33wgsw=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.131.0", + "rev": "v1.132.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NN4mnXzt1GJYGC0HBvYQBBZKENXfvVq7cTbE4XSPwto=" + "vendorHash": "sha256-5F8A8v8YQXrYAgWGYjO5G+sY3SY+O2oiYo3zVLZ9LUc=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1124,13 +1124,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-wrqlEWM2id6NXfTGOM7iVbQkKP2CUwpCZdr9n3Lgvuk=", + "hash": "sha256-KYJ37/lr/ZC3CSbWEYemM9pzzWDAlfNQS0KP68VqPso=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.47.0", + "rev": "v0.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HdTx9f9ytE5/IG4yv1Xnqd/5ZA+ZaF6jjUmtI/q5yc0=" + "vendorHash": "sha256-Q66BRTiZ/Yuk7+fQWhqM8WCCRNVnfu6qx4E9jr+goXI=" }, "thunder": { "hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=", diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 779fa891b44ad..b06de9cdc6755 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-4eaoTcbb7ddcSRWng3GsgK8JdFRMxxb0V7V1G7WV9tg="; + hash = "sha256-AcU/1/TBS0nT7bXYguM8KI4mBUQzvSTVwuQkzq3t3EY="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-wOD/Iuks32TiBOFVsuaLzYe3vlOtz6MCI9abscZMxJc="; + vendorHash = "sha256-GVSI3yv7YzW2QPC26gA2C3TqjBnTxyiPzmW+hsGGdaQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 05f936d46f069..dabb9743794f2 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -22,8 +22,10 @@ python3.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - # ~400 failures - doCheck = false; + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; propagatedBuildInputs = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt @@ -42,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { packaging psutil pynzb + pyrsistent pyrss2gen python-dateutil pyyaml @@ -73,6 +76,9 @@ python3.pkgs.buildPythonApplication rec { "flexget.plugins.clients.transmission" ]; + # ~400 failures + doCheck = false; + meta = with lib; { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index f34cca6f92963..83bf99b828d19 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook gettext + gobject-introspection ]; buildInputs = [ qrencode - gobject-introspection glib glib-networking # required for TLS support libadwaita diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 4fc1a9d352e86..3e6fa0d92499d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { format = "pyproject"; buildInputs = [ - gobject-introspection gtk3 gnome.adwaita-icon-theme + gtk3 gnome.adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ - gettext wrapGAppsHook + gettext wrapGAppsHook gobject-introspection ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index e71d5c020fe6e..df75f7192bf71 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -23,10 +23,9 @@ buildGoModule rec { buildInputs = [ gtk4 glib - gobject-introspection ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; # Checking requires a working display doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index ffc2eea5b8682..b34ed84d044da 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -78,12 +78,11 @@ with mikutterPaths; stdenv.mkDerivation rec { sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ] + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ libicns ]; buildInputs = [ atk gtk2 - gobject-introspection libnotify which # some plugins use it at runtime wrappedRuby diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 5a72c1bd1e83c..a9ce755be58a2 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -81,6 +81,9 @@ stdenv.mkDerivation { # Remove bundled libraries rm -r $out/opt/QQ/resources/app/sharp-lib + # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793 + rm -r $out/opt/QQ/resources/app/libssh2.so.1 + # https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \ $out/opt/QQ/libappindicator3.so diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 47c448c9b3233..4f6b3015cf34c 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -41,13 +41,13 @@ python3Packages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gobject-introspection libsecret ] ++ pluginsDeps; nativeBuildInputs = [ gettext wrapGAppsHook + gobject-introspection # To later add plugins to xorg.lndir ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix index 1def97bd62d76..bb758565eb8a9 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix @@ -16,8 +16,11 @@ python3Packages.buildPythonPackage rec { sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680"; }; - buildInputs = [ + nativeBuildInputs = [ gobject-introspection + ]; + + buildInputs = [ gnome-online-accounts ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 68e2bec7ccc38..bca6c566b74c6 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { python3Packages.wrapPython intltool pkg-config + gobject-introspection ]; buildInputs = [ @@ -49,7 +50,6 @@ stdenv.mkDerivation rec { libpeas gsettings-desktop-schemas json-glib - gobject-introspection libsecret glib-networking libnotify diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index c30b9ede2bba0..621fce9e4579c 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ appstream desktop-file-utils glib - gobject-introspection gtk3 html2text libgee diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index a2d0d73f79034..294121b32ecd5 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; }; - nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja python3 wrapGAppsHook gobject-introspection ]; postPatch = '' patchShebangs build-aux/meson/postinstall.py @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { gtk3 webkitgtk desktop-file-utils - gobject-introspection gsettings-desktop-schemas ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70df53f1eb6b1..bec44b0b7ff3c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , lib , substituteAll , pam @@ -220,6 +221,12 @@ in # for 7.4. patches = lib.optionals (lib.versionAtLeast version "7.5") [ ./0001-Strip-away-BUILDCONFIG.patch + ] ++ [ + (fetchpatch { + name = "fix-curl-8.2.patch"; + url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; + hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix new file mode 100644 index 0000000000000..51957037cc2be --- /dev/null +++ b/pkgs/applications/office/planner/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, desktop-file-utils +, gsettings-desktop-schemas +, glib +, gtk3 +, libgda +, libxml2 +, libxslt +, makeWrapper +, meson +, ninja +, pkg-config +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "planner"; + version = "0.14.91"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "planner"; + rev = version; + hash = "sha256-LxctZv/CKolJ1I4Hql20E+/+p+ZoJLR1eZe34HPMqvY="; + }; + + postPatch = '' + patchShebangs \ + meson_post_install.sh \ + tools/strip_trailing_white_space.sh \ + tests/python/task-test.py + ''; + + nativeBuildInputs = [ + desktop-file-utils + makeWrapper + meson + ninja + pkg-config + shared-mime-info + ]; + + buildInputs = [ + libgda + libxml2 + libxslt + glib + gsettings-desktop-schemas + gtk3 + ]; + + postInstall = '' + wrapProgram $out/bin/planner \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/planner-${version}" + ''; + + meta = { + description = "Project management tool for the GNOME desktop"; + homepage = "https://wiki.gnome.org/Apps/Planner"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ amiloradovsky ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 18d6912a2b8a8..2e79ca03635a2 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, perl , gmp , mpfr , flint @@ -15,10 +14,14 @@ , ninja , ant , openjdk -, perlPackages +, perl536Packages , makeWrapper }: - +let + # log says: polymake does not work with perl 5.37 or newer; + perlPackages = perl536Packages; + inherit (perlPackages) perl; +in # polymake compiles its own version of sympol and atint because we # don't have those packages. other missing optional dependencies: # javaview, libnormaliz, scip, soplex, jreality. diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.25-deprecation.patch b/pkgs/applications/science/math/sage/patches/numpy-1.25-deprecation.patch new file mode 100644 index 0000000000000..539afc4b3b77d --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/numpy-1.25-deprecation.patch @@ -0,0 +1,18 @@ +diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py +index aa153fd4cd..eebbe87aff 100644 +--- a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py ++++ b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py +@@ -134,11 +134,11 @@ Sage example in ./graphique.tex, line 1120:: + sage: t = srange(0, 5, 0.1); p = Graphics() + sage: for k in srange(0, 10, 0.15): + ....: y = integrate.odeint(f, k, t) +- ....: p += line(zip(t, flatten(y))) ++ ....: p += line(zip(t, y.flatten())) + sage: t = srange(0, -5, -0.1); q = Graphics() + sage: for k in srange(0, 10, 0.15): + ....: y = integrate.odeint(f, k, t) +- ....: q += line(zip(t, flatten(y))) ++ ....: q += line(zip(t, y.flatten())) + sage: y = var('y') + sage: v = plot_vector_field((1, -cos(x*y)), (x,-5,5), (y,-2,11)) + sage: g = p + q + v; g.show() diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d890a65230cb1..dee6e8eb0d4b2 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -80,6 +80,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-k8Oam+EiRcfXC7qCdLacCx+7vpUAw2K1wsjKcQbeGb4="; }) + # https://github.com/sagemath/sage/pull/35826, landed in 10.1.beta5 + (fetchpatch { + name = "numpy-1.25.0-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/ecfe06b8f1fe729b07e885f0de55244467e5c137.diff"; + sha256 = "sha256-G0xhl+LyNdDYPzRqSHK3fHaepcIzpuwmqRiussraDf0="; + }) + + # https://github.com/sagemath/sage/pull/35826#issuecomment-1658569891 + ./patches/numpy-1.25-deprecation.patch + + # https://github.com/sagemath/sage/pull/35842, landed in 10.1.beta5 + (fetchpatch { + name = "scipy-1.11-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/90ece168c3c61508baa36659b0027b7dd8b43add.diff"; + sha256 = "sha256-Y5TmuJcUJR+veb2AuSVODGs+xkVV+pTM8fWTm4q+NDs="; + }) + # https://github.com/sagemath/sage/pull/35825, landed in 10.1.beta6 (fetchpatch { name = "singular-4.3.2p2-upgrade.patch"; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index f037867aee43b..6179c1719d33b 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "383"; + version = "384"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-oGYTvNpQjCob/21CMIldp0p5h5mi45ojusggide5qZg="; + hash = "sha256-Me+HB0DOrgIMPEtKlgHH9Hv9RmcsGq8tITpWXWTLw3M="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index 051b7dfdc9240..40a7fc6ba79b2 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -1,9 +1,8 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 +, libgit2_1_6 }: rustPlatform.buildRustPackage rec { @@ -18,7 +17,10 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 ]; + + buildInputs = [ + libgit2_1_6 + ]; cargoHash = "sha256-28sMY47LAdaGmPNmxeu/w1Pn6AV3JlWbxFcit5pLkI0"; diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 80cb28a09e5b9..b5682ad4bafa8 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 +, libgit2_1_6 , zlib }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2 + libgit2_1_6 zlib ]; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index cdcb45fa5fd52..1270fbae33d25 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -24,6 +24,7 @@ let inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; + disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index b163fc2aa60b8..daf56c174456a 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { python3 # for build scripts pkgconf wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -79,7 +80,6 @@ stdenv.mkDerivation rec { elfutils gexiv2 glib - gobject-introspection gst-plugins-base gstreamer gtk3 diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 7e85b65de35fb..2643a449c60fd 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins + ffmpeg frei0r sox gtk3 ladspaPlugins (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b93d7d6606c49..057b9874162ad 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -97,7 +97,7 @@ let else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.35.1"; + version = "0.36.0"; outputs = [ "out" "dev" "man" ]; @@ -105,15 +105,16 @@ in stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; + hash = "sha256-82moFbWvfc1awXih0d0D+dHqYbIoGNZ77RmafQ80IOY="; }; patches = [ + # Revert "meson: use the new build_options method" to avoid a + # cycle between the out and dev outputs. (fetchpatch { - # fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392 - # to be removed on next release - url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch"; - sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8="; + url = "https://github.com/mpv-player/mpv/commit/3c1686488b48bd2760e9b19f42e7d3be1363d00a.patch"; + hash = "sha256-eYXfX8Y08q4Bl41VHBpwbxYRMZgm/iziXeK6AOp8O6I="; + revert = true; }) ]; diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/applications/video/recapp/default.nix index 7ec88af821e54..1e644ff9f4172 100644 --- a/pkgs/applications/video/recapp/default.nix +++ b/pkgs/applications/video/recapp/default.nix @@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ libnotify librsvg - gobject-introspection gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 56ba7957a5a2b..20a9772021a91 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation rec { itstool pkg-config yelp-tools + gobject-introspection ]; buildInputs = [ clutter-gst clutter-gtk glib - gobject-introspection gst-plugins-bad gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index f07debac98ef7..8b04cda31864d 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ]; + maintainers = with maintainers; [ offline vdemeester endocrimes ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b19f17275ad6f..3c377d011bd34 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor + gobject-introspection ]; outputs = [ "out" "doc" ]; @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = toString fontsConf; propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection + buildInputs = [ cairo librsvg dbus gdk-pixbuf git luaEnv libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 3472c760428bc..73136980aa93f 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -19,7 +19,11 @@ python3Packages.buildPythonApplication rec { sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; - buildInputs = [ libpulseaudio libnotify gobject-introspection ]; + nativeBuildInputs = [ + gobject-introspection + ]; + + buildInputs = [ libpulseaudio libnotify ]; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw pygobject3 diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index ddcab10957191..b5eda761ab337 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -30,14 +30,14 @@ , withDebug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picom"; version = "10.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0="; fetchSubmodules = true; }; @@ -113,5 +113,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yshui/picom"; maintainers = with maintainers; [ ertes twey thiagokokada ]; platforms = platforms.linux; + mainProgram = "picom"; }; -} +}) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 20a7a5ed7fe08..0b438df13d289 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { you need to set "security.pam.services.swaylock = {};" manually. ''; inherit (src.meta) homepage; + mainProgram = "swaylock"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index fa240d18c96ba..b70c5bda0a59b 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-sYWR6rJ4vBkXIPbAkVgEC3lecRivHV3cpqzZqOIDlTU="; + hash = "sha256-62hqfPAJkqI7F/GS/KmohzE+ksNG7jXYV1GWmD1la0o="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index f9de0ad468b2b..3ffff74f70e23 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -10,9 +10,12 @@ args@{ , bazelFlags ? [] , bazelBuildFlags ? [] , bazelTestFlags ? [] +, bazelRunFlags ? [] +, runTargetFlags ? [] , bazelFetchFlags ? [] -, bazelTargets +, bazelTargets ? [] , bazelTestTargets ? [] +, bazelRunTarget ? null , buildAttrs , fetchAttrs @@ -46,17 +49,23 @@ args@{ let fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" "removeRulesCC" ] // { - name = name; - bazelFlags = bazelFlags; - bazelBuildFlags = bazelBuildFlags; - bazelTestFlags = bazelTestFlags; - bazelFetchFlags = bazelFetchFlags; - bazelTestTargets = bazelTestTargets; - dontAddBazelOpts = dontAddBazelOpts; + inherit + name + bazelFlags + bazelBuildFlags + bazelTestFlags + bazelRunFlags + runTargetFlags + bazelFetchFlags + bazelTargets + bazelTestTargets + bazelRunTarget + dontAddBazelOpts + ; }; fBuildAttrs = fArgs // buildAttrs; fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; - bazelCmd = { cmd, additionalFlags, targets }: + bazelCmd = { cmd, additionalFlags, targets, targetRunFlags ? [ ] }: lib.optionalString (targets != [ ]) '' # See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables] BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ @@ -73,7 +82,8 @@ let "''${host_linkopts[@]}" \ $bazelFlags \ ${lib.strings.concatStringsSep " " additionalFlags} \ - ${lib.strings.concatStringsSep " " targets} + ${lib.strings.concatStringsSep " " targets} \ + ${lib.optionalString (targetRunFlags != []) " -- " + lib.strings.concatStringsSep " " targetRunFlags} ''; # we need this to chmod dangling symlinks on darwin, gnu coreutils refuses to do so: # chmod: cannot operate on dangling symlink '$symlink' @@ -262,6 +272,15 @@ stdenv.mkDerivation (fBuildAttrs // { targets = fBuildAttrs.bazelTargets; } } + ${ + bazelCmd { + cmd = "run"; + additionalFlags = fBuildAttrs.bazelRunFlags ++ [ "--jobs" "$NIX_BUILD_CORES" ]; + # Bazel run only accepts a single target, but `bazelCmd` expects `targets` to be a list. + targets = lib.optionals (fBuildAttrs.bazelRunTarget != null) [ fBuildAttrs.bazelRunTarget ]; + targetRunFlags = fBuildAttrs.runTargetFlags; + } + } runHook postBuild ''; }) diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 07ac6737f39da..7f5cd4cf4af3b 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -81,8 +81,18 @@ for flag in "${!hardeningEnableMap[@]}"; do hardeningCFlags+=('-fPIC') ;; strictoverflow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi - hardeningCFlags+=('-fno-strict-overflow') + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi + if (( @isClang@ )); then + # In Clang, -fno-strict-overflow only serves to set -fwrapv and is + # reported as an unused CLI argument if -fwrapv or -fno-wrapv is set + # explicitly, so we side step that by doing the conversion here. + # + # See: https://github.com/llvm/llvm-project/blob/llvmorg-16.0.6/clang/lib/Driver/ToolChains/Clang.cpp#L6315 + # + hardeningCFlags+=('-fwrapv') + else + hardeningCFlags+=('-fno-strict-overflow') + fi ;; format) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 551074e0a2112..53141cac5dfbb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -609,6 +609,8 @@ stdenv.mkDerivation { env = { + inherit isClang; + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 6e2de7fa11b05..1ab4a0db827aa 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, bintools-unwrapped, llvmPackages_13, coreutils }: - +{ lib, stdenv, bintools-unwrapped, llvmPackages, llvmPackages_13, coreutils }: + +let + # aarch64-darwin needs a clang that can build arm64e binaries, so make sure a version of LLVM + # is used that can do that, but prefer the stdenv one if it is new enough. + llvmPkgs = if (lib.versionAtLeast (lib.getVersion llvmPackages.clang) "13") + then llvmPackages + else llvmPackages_13; + in if stdenv.hostPlatform.isStatic then throw '' libredirect is not available on static builds. @@ -39,11 +46,11 @@ else stdenv.mkDerivation rec { # and the library search directory for libdl. # We can't build this on x86_64, because the libSystem we point to doesn't # like arm64(e). - PATH=${bintools-unwrapped}/bin:${llvmPackages_13.clang-unwrapped}/bin:$PATH \ + PATH=${bintools-unwrapped}/bin:${llvmPkgs.clang-unwrapped}/bin:$PATH \ clang -arch x86_64 -arch arm64 -arch arm64e \ - -isystem ${llvmPackages_13.clang.libc}/include \ - -isystem ${llvmPackages_13.libclang.lib}/lib/clang/*/include \ - -L${llvmPackages_13.clang.libc}/lib \ + -isystem ${llvmPkgs.clang.libc}/include \ + -isystem ${llvmPkgs.libclang.lib}/lib/clang/*/include \ + -L${llvmPkgs.clang.libc}/lib \ -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ -shared -o "$libName" diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 9ecc16450cc27..19211a813eb84 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -106,7 +106,7 @@ static int open_needs_mode(int flags) WRAPPER(int, open)(const char * path, int flags, ...) { - int (*open_real) (const char *, int, mode_t) = LOOKUP_REAL(open); + int (*open_real) (const char *, int, ...) = LOOKUP_REAL(open); mode_t mode = 0; if (open_needs_mode(flags)) { va_list ap; @@ -139,7 +139,7 @@ WRAPPER_DEF(open64) WRAPPER(int, openat)(int dirfd, const char * path, int flags, ...) { - int (*openat_real) (int, const char *, int, mode_t) = LOOKUP_REAL(openat); + int (*openat_real) (int, const char *, int, ...) = LOOKUP_REAL(openat); mode_t mode = 0; if (open_needs_mode(flags)) { va_list ap; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index e4db2c8a0573f..f04eeeaa9bf5f 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -193,8 +193,8 @@ in }; graphene-sys = attrs: { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ graphene gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; + buildInputs = [ graphene ]; }; nettle-sys = attrs: { diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 41b313280d702..62d5619660c67 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -24,8 +24,6 @@ maturinBuildHook() { ${maturinBuildFlags-} ) - runHook postBuild - if [ ! -z "${buildAndTestSubdir-}" ]; then popd fi @@ -34,6 +32,9 @@ maturinBuildHook() { mkdir -p dist mv target/wheels/*.whl dist/ + # These are python build hooks and may depend on ./dist + runHook postBuild + echo "Finished maturinBuildHook" } diff --git a/pkgs/build-support/setup-hooks/strip-tmp-aarch64.sh b/pkgs/build-support/setup-hooks/strip-tmp-aarch64.sh new file mode 100644 index 0000000000000..5f53e7e95b2ef --- /dev/null +++ b/pkgs/build-support/setup-hooks/strip-tmp-aarch64.sh @@ -0,0 +1,90 @@ +# This setup hook strips libraries and executables in the fixup phase. + +fixupOutputHooks+=(_doStrip) + +_doStrip() { + # We don't bother to strip build platform code because it shouldn't make it + # to $out anyways---if it does, that's a bigger problem that a lack of + # stripping will help catch. + local -ra flags=(dontStripHost dontStripTarget) + local -ra debugDirs=(stripDebugList stripDebugListTarget) + local -ra allDirs=(stripAllList stripAllListTarget) + local -ra stripCmds=(STRIP STRIP_FOR_TARGET) + local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET) + + # TODO(structured-attrs): This doesn't work correctly if one of + # the items in strip*List or strip*Flags contains a space, + # even with structured attrs enabled. This is OK for now + # because very few packages set any of these, and it doesn't + # affect any of them. + # + # After __structuredAttrs = true is universal, come back and + # push arrays all the way through this logic. + + # Strip only host paths by default. Leave targets as is. + stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin} + stripDebugListTarget=${stripDebugListTarget[*]:-} + stripAllList=${stripAllList[*]:-} + stripAllListTarget=${stripAllListTarget[*]:-} + + local i + for i in ${!stripCmds[@]}; do + local -n flag="${flags[$i]}" + local -n debugDirList="${debugDirs[$i]}" + local -n allDirList="${allDirs[$i]}" + local -n stripCmd="${stripCmds[$i]}" + local -n ranlibCmd="${ranlibCmds[$i]}" + + # `dontStrip` disables them all + if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2 + then continue; fi + + stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}" + stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}" + done +} + +stripDirs() { + local cmd="$1" + local ranlibCmd="$2" + local paths="$3" + local stripFlags="$4" + local pathsNew= + + [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1 + [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1 + + local p + for p in ${paths}; do + if [ -e "$prefix/$p" ]; then + pathsNew="${pathsNew} $prefix/$p" + fi + done + paths=${pathsNew} + + if [ -n "${paths}" ]; then + echo "stripping (with command $cmd and flags $stripFlags) in $paths" + local striperr + striperr="$(mktemp 'striperr.XXXXXX')" + # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh. + find $paths -type f -a '!' -path "$prefix/lib/debug/*" -print0 | + # Make sure we process files under symlinks only once. Otherwise + # 'strip` can corrupt files when writes to them in parallel: + # https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039 + xargs -r -0 -n1 -- realpath -z | sort -u -z | + + xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$? + # xargs exits with status code 123 if some but not all of the + # processes fail. We don't care if some of the files couldn't + # be stripped, so ignore specifically this code. + [[ "$exit_code" = 123 || -z "$exit_code" ]] || (cat "$striperr" 1>&2 && exit 1) + + rm "$striperr" + # 'strip' does not normally preserve archive index in .a files. + # This usually causes linking failures against static libs like: + # ld: ...-i686-w64-mingw32-stage-final-gcc-13.0.0-lib/i686-w64-mingw32/lib/libstdc++.dll.a: + # error adding symbols: archive has no index; run ranlib to add one + # Restore the index by running 'ranlib'. + find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2>/dev/null + fi +} diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 849148e92149d..1d65c10c52308 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -51,6 +51,9 @@ stripDirs() { local stripFlags="$4" local pathsNew= + [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1 + [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1 + local p for p in ${paths}; do if [ -e "$prefix/$p" ]; then @@ -61,8 +64,17 @@ stripDirs() { if [ -n "${paths}" ]; then echo "stripping (with command $cmd and flags $stripFlags) in $paths" + local striperr + striperr="$(mktemp 'striperr.XXXXXX')" # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh. - find $paths -type f -a '!' -wholename "$prefix/lib/debug/*" -exec $cmd $stripFlags '{}' \; 2>/dev/null + find $paths -type f -a '!' -path "$prefix/lib/debug/*" -print0 | + xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$? + # xargs exits with status code 123 if some but not all of the + # processes fail. We don't care if some of the files couldn't + # be stripped, so ignore specifically this code. + [[ "$exit_code" = 123 || -z "$exit_code" ]] || (cat "$striperr" 1>&2 && exit 1) + + rm "$striperr" # 'strip' does not normally preserve archive index in .a files. # This usually causes linking failures against static libs like: # ld: ...-i686-w64-mingw32-stage-final-gcc-13.0.0-lib/i686-w64-mingw32/lib/libstdc++.dll.a: diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 2f9111865455f..0174324b016ae 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -11,6 +11,7 @@ let , rev , hash , zip ? "" + , prefix ? "" }: let Family = lib.toUpper (lib.substring 0 1 family) + @@ -21,7 +22,7 @@ let version = lib.removeSuffix "R" rev; src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/${prefix}SourceHan${Family}.ttc${zip}"; inherit hash; }; @@ -61,9 +62,10 @@ in serif = makePackage { family = "serif"; description = "serif"; - rev = "2.000R"; - hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM="; + rev = "2.001R"; + hash = "sha256-ULdrtPLtzsgfZEHWkr4ebC/FSROHBWJJVD+PzdIJ6Og="; zip = ".zip"; + prefix = "01_"; }; mono = makePackage { diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/data/fonts/source-sans/default.nix index 1433804ce71d7..a3e2d4309066e 100644 --- a/pkgs/data/fonts/source-sans/default.nix +++ b/pkgs/data/fonts/source-sans/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "source-sans"; - version = "3.046"; + version = "3.052"; src = fetchzip { url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; - hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU="; + hash = "sha256-yzbYy/ZS1GGlgJW+ARVWF4tjFqmMq7x+YqSQnojtQBs="; }; installPhase = '' @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { install -Dm444 OTF/*.otf -t $out/share/fonts/opentype install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype - install -Dm444 VAR/*.otf -t $out/share/fonts/variable + install -Dm444 VF/*.otf -t $out/share/fonts/variable runHook postInstall ''; diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix index 626b36f2705b0..dd129b10faab9 100644 --- a/pkgs/data/fonts/source-serif/default.nix +++ b/pkgs/data/fonts/source-serif/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "source-serif"; - version = "4.004"; + version = "4.005"; src = fetchzip { - url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; - hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4="; + url = "https://github.com/adobe-fonts/source-serif/archive/refs/tags/${version}R.zip"; + hash = "sha256-djeRJWcKqirkHus52JSeZJXeB7yMTnUXpkPxyzgRC04="; }; installPhase = '' diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 6fd4a6641cec5..d489c23c6b8d0 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -30,7 +30,7 @@ let ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.90"; + srcVersion = "3.92"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -45,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; }; dontBuild = true; diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 8077e29316a8f..2d7fd0c6c022f 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { wrapGAppsHook gsettings-desktop-schemas gettext + gobject-introspection ]; buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) - gobject-introspection gsettings-desktop-schemas gtk3 glib diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 93888dd1179f6..3ff56b18d2557 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , evolution-data-server , fetchFromGitHub +, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -84,6 +85,13 @@ stdenv.mkDerivation rec { patches = [ ./use-sane-install-dir.patch ./libdir.patch + + # Backport pillow 10.0.0 support. + # https://github.com/linuxmint/cinnamon/issues/11746 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch"; + hash = "sha256-flt7CblfXlLieAVNeC8TBnv1TX0Zca1obPWusBMnIxE="; + }) ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 5e736ea1fdc85..e42e5a6069b9e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { xorg.libxkbfile xorg.libXext xorg.libXrandr - gobject-introspection ]; nativeBuildInputs = [ @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool pkg-config + gobject-introspection ]; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 1b5dbeb8d0853..444a68778664d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gobject-introspection ]; nativeBuildInputs = [ @@ -30,6 +29,7 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook pkg-config + gobject-introspection ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 6692aac628fdf..956a87773d6d1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { libtool meson ninja + gobject-introspection ]; buildInputs = [ # from meson.build - gobject-introspection gtk3 glib diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 0c07b46822a73..681d6afd4ead2 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + gobject-introspection ]; buildInputs = [ - gobject-introspection cairo readline spidermonkey_102 diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index d3046830f012f..c2ad10f97ac03 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook xorgserver # for cvt command + gobject-introspection ]; buildInputs = [ @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { cinnamon-desktop dbus glib - gobject-introspection gtk3 libcanberra libdrm diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 0b4e3be1a3254..f82c00f4a9d13 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { libexif exempi gvfs - gobject-introspection libgsf ]; @@ -60,6 +59,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool shared-mime-info + gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 10e6c4e96bf27..ef434171d914f 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -1,7 +1,7 @@ { stdenv , lib -, fetchurl , fetchFromGitHub +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +43,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0="; }; + patches = [ + # Fix build with exiv2 0.28, can be removed on next update + # https://github.com/linuxmint/pix/pull/178 + (fetchpatch { + url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch"; + sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4="; + }) + ]; + nativeBuildInputs = [ bison desktop-file-utils diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 7139dce15c79e..5b38d0662ea55 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection (python3.withPackages (ps: with ps; [ pygobject3 setproctitle # mate applet diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix index 7f377d2a6e744..eecdbeb990ba2 100644 --- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config go + gobject-introspection ]; buildInputs = [ libgudev - gobject-introspection ]; makeFlags = [ diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index d66efad0728db..5c5aba52704df 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -58,7 +58,6 @@ python3.pkgs.buildPythonApplication rec { glib libmediaart gnome-online-accounts - gobject-introspection gdk-pixbuf python3 grilo diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch new file mode 100644 index 0000000000000..96688c8d80867 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch @@ -0,0 +1,73 @@ +From 0417f60c7e760e1ebc6acd3dc23818b38c3929e7 Mon Sep 17 00:00:00 2001 +From: Weijia Wang <contact@weijia.wang> +Date: Mon, 7 Aug 2023 21:51:30 +0200 +Subject: [PATCH] Fix build with Exiv2 0.28 + +--- + src/gcm-helper-exiv.cpp | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp +index 7ec69948..23c8b320 100644 +--- a/src/gcm-helper-exiv.cpp ++++ b/src/gcm-helper-exiv.cpp +@@ -22,6 +22,10 @@ + #include <exiv2/image.hpp> + #include <exiv2/exif.hpp> + ++#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 28) ++#define HAVE_EXIV2_0_28 ++#endif ++ + #if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27) + #define HAVE_EXIV2_ERROR_CODE + #include <exiv2/error.hpp> +@@ -33,7 +37,11 @@ + int + main (int argc, char* const argv[]) + { ++#ifdef HAVE_EXIV2_0_28 ++ Exiv2::Image::UniquePtr image; ++#else + Exiv2::Image::AutoPtr image; ++#endif + Exiv2::ExifData exifData; + std::string filename; + std::string make; +@@ -57,7 +65,9 @@ main (int argc, char* const argv[]) + if (argc == 2) + filename = argv[1]; + if (filename.empty()) +-#ifdef HAVE_EXIV2_ERROR_CODE ++#ifdef HAVE_EXIV2_0_28 ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "No filename specified"); ++#elif defined(HAVE_EXIV2_ERROR_CODE) + throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); + #else + throw Exiv2::Error(1, "No filename specified"); +@@ -70,7 +80,9 @@ main (int argc, char* const argv[]) + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; +-#ifdef HAVE_EXIV2_ERROR_CODE ++#ifdef HAVE_EXIV2_0_28 ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); ++#elif defined(HAVE_EXIV2_ERROR_CODE) + throw Exiv2::Error(Exiv2::kerErrorMessage, error); + #else + throw Exiv2::Error(1, error); +@@ -89,7 +101,11 @@ main (int argc, char* const argv[]) + std::cout << model << "\n"; + std::cout << make << "\n"; + std::cout << serial << "\n"; ++#ifdef HAVE_EXIV2_0_28 ++ } catch (Exiv2::Error& e) { ++#else + } catch (Exiv2::AnyError& e) { ++#endif + std::cout << "Failed to load: " << e << "\n"; + retval = -1; + } +-- +2.39.2 (Apple Git-143) + diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index dae367f1d5baa..7c9d3df9f1c02 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; + patches = [ + ./0001-Fix-build-with-Exiv2-0.28.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 7528f1bc3a5de..5c49914cdf024 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { desktop-file-utils libxslt.bin asciidoc + gobject-introspection ]; buildInputs = [ @@ -153,7 +154,6 @@ stdenv.mkDerivation rec { ibus gnome-desktop gnome-settings-daemon - gobject-introspection mesa # recording diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 0f864c6f34978..2202e94881c10 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -110,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas gtk3 libcanberra diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 360095a8ad1d6..4c0960eb25e33 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -116,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas atk fribidi diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 835fa31dd29bc..1b09d4da0ef13 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -32,7 +32,6 @@ buildPythonApplication rec { buildInputs = [ gnome.gnome-shell - gobject-introspection # for Gio typelib ]; pythonPath = [ diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 759a8aaeaa60f..9bf22ba6dcf26 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -45,8 +45,14 @@ stdenv.mkDerivation rec { checkTarget = "test"; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; meta = { description = "Efficient Scheme compiler"; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index c61093c67c03a..ff473019de775 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -144,12 +144,10 @@ let majorVersion = "10"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9"; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 92abdebe49b3c..b009972307740 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -157,12 +157,10 @@ let majorVersion = "11"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 9665c2a9fe85b..da9ebb0a63c17 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -201,12 +201,10 @@ let majorVersion = "12"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix index 1b73c251ce6f8..82b30a0e5102d 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -195,12 +195,10 @@ let majorVersion = "13"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "sha256-YdaE8Kpedqxlha2ImKJCeq3ol57V5/hUkihsTfwT7oY="; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index fa856eff96e5f..acc8ba41a00b2 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -193,12 +193,10 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index bab79f968db38..fadc9b72c45fc 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -210,12 +210,10 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index f443babb4b706..f19c2b4f46c8a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -199,12 +199,10 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = if stdenv.targetPlatform.isVc4 then fetchFromGitHub { owner = "itszor"; repo = "gcc-vc4"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5b6ea7ead50a5..72e241214fe46 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -149,12 +149,10 @@ let majorVersion = "7"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index f903e264b0af6..274373a4fc8f3 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -130,12 +130,10 @@ let majorVersion = "8"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 289212a136356..d08de2a5b79ce 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -144,12 +144,10 @@ let majorVersion = "9"; in -lib.pipe (stdenv.mkDerivation ({ +lib.pipe ((callFile ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - builder = ../builder.sh; - src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh deleted file mode 100644 index d9016c45e5794..0000000000000 --- a/pkgs/development/compilers/gcc/builder.sh +++ /dev/null @@ -1,290 +0,0 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi -source $stdenv/setup - - -oldOpts="$(shopt -po nounset)" || true -set -euo pipefail - - -export NIX_FIXINC_DUMMY="$NIX_BUILD_TOP/dummy" -mkdir "$NIX_FIXINC_DUMMY" - - -if test "$staticCompiler" = "1"; then - EXTRA_LDFLAGS="-static" -else - EXTRA_LDFLAGS="-Wl,-rpath,${!outputLib}/lib" -fi - - -# GCC interprets empty paths as ".", which we don't want. -if test -z "${CPATH-}"; then unset CPATH; fi -if test -z "${LIBRARY_PATH-}"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`${CPATH-}'" -echo "\$LIBRARY_PATH is \`${LIBRARY_PATH-}'" - -if test "$noSysDirs" = "1"; then - - declare \ - EXTRA_FLAGS_FOR_BUILD EXTRA_FLAGS EXTRA_FLAGS_FOR_TARGET \ - EXTRA_LDFLAGS_FOR_BUILD EXTRA_LDFLAGS_FOR_TARGET - - # Extract flags from Bintools Wrappers - for post in '_FOR_BUILD' ''; do - curBintools="NIX_BINTOOLS${post}" - - declare -a extraLDFlags=() - if [[ -e "${!curBintools}/nix-support/orig-libc" ]]; then - # Figure out what extra flags when linking to pass to the gcc - # compilers being generated to make sure that they use our libc. - extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) - if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then - extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker) - fi - - # The path to the Libc binaries such as `crti.o'. - libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" - else - # Hack: support impure environments. - extraLDFlags=("-L/usr/lib64" "-L/usr/lib") - libc_libdir="/usr/lib" - fi - extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" - "${extraLDFlags[@]}") - for i in "${extraLDFlags[@]}"; do - declare EXTRA_LDFLAGS${post}+=" -Wl,$i" - done - done - - # Extract flags from CC Wrappers - for post in '_FOR_BUILD' ''; do - curCC="NIX_CC${post}" - curFIXINC="NIX_FIXINC_DUMMY${post}" - - declare -a extraFlags=() - if [[ -e "${!curCC}/nix-support/orig-libc" ]]; then - # Figure out what extra compiling flags to pass to the gcc compilers - # being generated to make sure that they use our libc. - extraFlags=($(< "${!curCC}/nix-support/libc-crt1-cflags") $(< "${!curCC}/nix-support/libc-cflags")) - - # The path to the Libc headers - libc_devdir="$(< "${!curCC}/nix-support/orig-libc-dev")" - - # Use *real* header files, otherwise a limits.h is generated that - # does not include Libc's limits.h (notably missing SSIZE_MAX, - # which breaks the build). - declare NIX_FIXINC_DUMMY${post}="$libc_devdir/include" - else - # Hack: support impure environments. - extraFlags=("-isystem" "/usr/include") - declare NIX_FIXINC_DUMMY${post}=/usr/include - fi - - extraFlags=("-I${!curFIXINC}" "${extraFlags[@]}") - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, make - # sure to explictly add them so that files compiled with the bootstrap - # compiler are optimized and (optionally) contain debugging information - # (info "(gccinstall) Building"). - if test -n "${dontStrip-}"; then - extraFlags=("-O2" "-g" "${extraFlags[@]}") - else - # Don't pass `-g' at all; this saves space while building. - extraFlags=("-O2" "${extraFlags[@]}") - fi - - declare EXTRA_FLAGS${post}="${extraFlags[*]}" - done - - if test -z "${targetConfig-}"; then - # host = target, so the flags are the same - EXTRA_FLAGS_FOR_TARGET="$EXTRA_FLAGS" - EXTRA_LDFLAGS_FOR_TARGET="$EXTRA_LDFLAGS" - fi - - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find - # the startfiles. - # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx - # for the startfiles. - makeFlagsArray+=( - "BUILD_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" - "SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" - "NATIVE_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY" - - "LDFLAGS_FOR_BUILD=$EXTRA_LDFLAGS_FOR_BUILD" - #"LDFLAGS=$EXTRA_LDFLAGS" - "LDFLAGS_FOR_TARGET=$EXTRA_LDFLAGS_FOR_TARGET" - - "CFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" - "CXXFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" - "FLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" - - # It seems there is a bug in GCC 5 - #"CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" - #"CXXFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" - - "CFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" - "CXXFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" - "FLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" - ) - - if test -z "${targetConfig-}"; then - makeFlagsArray+=( - "BOOT_CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" - "BOOT_LDFLAGS=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" - ) - fi - - if test "$withoutTargetLibc" == 1; then - # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stage - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - else - makeFlagsArray+=( - 'LIMITS_H_TEST=true' - ) - fi -fi - -eval "$oldOpts" - -providedPreConfigure="$preConfigure"; -preConfigure() { - if test -n "$newlibSrc"; then - tar xvf "$newlibSrc" -C .. - ln -s ../newlib-*/newlib newlib - # Patch to get armvt5el working: - sed -i -e 's/ arm)/ arm*)/' newlib/configure.host - fi - - # Bug - they packaged zlib - if test -d "zlib"; then - # This breaks the build without-headers, which should build only - # the target libgcc as target libraries. - # See 'configure:5370' - rm -Rf zlib - fi - - if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then - mkdir -p ../mingw - # --with-build-sysroot expects that: - cp -R $libcCross/include ../mingw - configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." - fi - - # Eval the preConfigure script from nix expression. - eval "$providedPreConfigure" - - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Avoid store paths when embedding ./configure flags into gcc. - # Mangled arguments are still useful when reporting bugs upstream. - sed -e "/TOPLEVEL_CONFIGURE_ARGUMENTS=/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i Makefile -} - - -preInstall() { - mkdir -p "$out/${targetConfig}/lib" - mkdir -p "${!outputLib}/${targetConfig}/lib" - # Make ‘lib64’ symlinks to ‘lib’. - if [ -n "$linkLib64toLib" ]; then - ln -s lib "$out/${targetConfig}/lib64" - ln -s lib "${!outputLib}/${targetConfig}/lib64" - fi - # Make ‘lib32’ symlinks to ‘lib’. - if [ -n "$linkLib32toLib" ]; then - ln -s lib "$out/${targetConfig}/lib32" - ln -s lib "${!outputLib}/${targetConfig}/lib32" - fi -} - - -postInstall() { - # Move runtime libraries to lib output. - moveToOutput "${targetConfig+$targetConfig/}lib/lib*.so*" "${!outputLib}" - moveToOutput "${targetConfig+$targetConfig/}lib/lib*.la" "${!outputLib}" - moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dylib" "${!outputLib}" - moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dll.a" "${!outputLib}" - moveToOutput "share/gcc-*/python" "${!outputLib}" - - if [ -z "$enableShared" ]; then - moveToOutput "${targetConfig+$targetConfig/}lib/lib*.a" "${!outputLib}" - fi - - for i in "${!outputLib}/${targetConfig}"/lib/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "${!outputLib}" - done - - if [ -n "$enableMultilib" ]; then - moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.so*" "${!outputLib}" - moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.la" "${!outputLib}" - moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.dylib" "${!outputLib}" - - for i in "${!outputLib}/${targetConfig}"/lib64/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "${!outputLib}" - done - fi - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - - if type "install_name_tool"; then - for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do - install_name_tool -id "$i" "$i" || true - for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do - new_path=`echo "$old_path" | sed "s,$out,${!outputLib},"` - install_name_tool -change "$old_path" "$new_path" "$i" || true - done - done - fi - - # Cross-compiler specific: - # --with-headers=$dir option triggers gcc to make a private copy - # of $dir headers and use it later as `-isysroot`. This prevents - # cc-wrapper from overriding libc headers with `-idirafter`. - # It should be safe to drop it and rely solely on the cc-wrapper. - local sysinc_dir=$out/${targetConfig+$targetConfig/}sys-include - if [ -d "$sysinc_dir" ]; then - chmod -R u+w "$out/${targetConfig+$targetConfig/}sys-include" - rm -rfv "$out/${targetConfig+$targetConfig/}sys-include" - fi - - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done -} - -genericBuild diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix new file mode 100644 index 0000000000000..cd8d4572a158b --- /dev/null +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -0,0 +1,278 @@ +{ lib +, stdenv +, enableMultilib +}: + +originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { + preUnpack = '' + oldOpts="$(shopt -po nounset)" || true + set -euo pipefail + + export NIX_FIXINC_DUMMY="$NIX_BUILD_TOP/dummy" + mkdir "$NIX_FIXINC_DUMMY" + + if test "$staticCompiler" = "1"; then + EXTRA_LDFLAGS="-static" + else + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + fi + + # GCC interprets empty paths as ".", which we don't want. + if test -z "''${CPATH-}"; then unset CPATH; fi + if test -z "''${LIBRARY_PATH-}"; then unset LIBRARY_PATH; fi + echo "\$CPATH is \`''${CPATH-}'" + echo "\$LIBRARY_PATH is \`''${LIBRARY_PATH-}'" + + if test "$noSysDirs" = "1"; then + + declare -g \ + EXTRA_FLAGS_FOR_BUILD EXTRA_FLAGS EXTRA_FLAGS_FOR_TARGET \ + EXTRA_LDFLAGS_FOR_BUILD EXTRA_LDFLAGS_FOR_TARGET + + # Extract flags from Bintools Wrappers + for post in '_FOR_BUILD' ""; do + curBintools="NIX_BINTOOLS''${post}" + + declare -a extraLDFlags=() + if [[ -e "''${!curBintools}/nix-support/orig-libc" ]]; then + # Figure out what extra flags when linking to pass to the gcc + # compilers being generated to make sure that they use our libc. + extraLDFlags=($(< "''${!curBintools}/nix-support/libc-ldflags") $(< "''${!curBintools}/nix-support/libc-ldflags-before" || true)) + if [ -e ''${!curBintools}/nix-support/ld-set-dynamic-linker ]; then + extraLDFlags=-dynamic-linker=$(< ''${!curBintools}/nix-support/dynamic-linker) + fi + + # The path to the Libc binaries such as `crti.o'. + libc_libdir="$(< "''${!curBintools}/nix-support/orig-libc")/lib" + else + # Hack: support impure environments. + extraLDFlags=("-L/usr/lib64" "-L/usr/lib") + libc_libdir="/usr/lib" + fi + extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" + "''${extraLDFlags[@]}") + for i in "''${extraLDFlags[@]}"; do + declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i" + done + done + + # Extract flags from CC Wrappers + for post in '_FOR_BUILD' ""; do + curCC="NIX_CC''${post}" + curFIXINC="NIX_FIXINC_DUMMY''${post}" + + declare -a extraFlags=() + if [[ -e "''${!curCC}/nix-support/orig-libc" ]]; then + # Figure out what extra compiling flags to pass to the gcc compilers + # being generated to make sure that they use our libc. + extraFlags=($(< "''${!curCC}/nix-support/libc-crt1-cflags") $(< "''${!curCC}/nix-support/libc-cflags")) + + # The path to the Libc headers + libc_devdir="$(< "''${!curCC}/nix-support/orig-libc-dev")" + + # Use *real* header files, otherwise a limits.h is generated that + # does not include Libc's limits.h (notably missing SSIZE_MAX, + # which breaks the build). + declare -g NIX_FIXINC_DUMMY''${post}="$libc_devdir/include" + else + # Hack: support impure environments. + extraFlags=("-isystem" "/usr/include") + declare -g NIX_FIXINC_DUMMY''${post}=/usr/include + fi + + extraFlags=("-I''${!curFIXINC}" "''${extraFlags[@]}") + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, make + # sure to explictly add them so that files compiled with the bootstrap + # compiler are optimized and (optionally) contain debugging information + # (info "(gccinstall) Building"). + if test -n "''${dontStrip-}"; then + extraFlags=("-O2" "-g" "''${extraFlags[@]}") + else + # Don't pass `-g' at all; this saves space while building. + extraFlags=("-O2" "''${extraFlags[@]}") + fi + + declare -g EXTRA_FLAGS''${post}="''${extraFlags[*]}" + done + + if test -z "''${targetConfig-}"; then + # host = target, so the flags are the same + EXTRA_FLAGS_FOR_TARGET="$EXTRA_FLAGS" + EXTRA_LDFLAGS_FOR_TARGET="$EXTRA_LDFLAGS" + fi + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray+=( + "BUILD_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" + "SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" + "NATIVE_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY" + + "LDFLAGS_FOR_BUILD=$EXTRA_LDFLAGS_FOR_BUILD" + #"LDFLAGS=$EXTRA_LDFLAGS" + "LDFLAGS_FOR_TARGET=$EXTRA_LDFLAGS_FOR_TARGET" + + "CFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" + "CXXFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" + "FLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" + + # It seems there is a bug in GCC 5 + #"CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + #"CXXFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + + "CFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + "CXXFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + "FLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + ) + + if test -z "''${targetConfig-}"; then + makeFlagsArray+=( + "BOOT_CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + "BOOT_LDFLAGS=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + ) + fi + + if test "$withoutTargetLibc" == 1; then + # We don't want the gcc build to assume there will be a libc providing + # limits.h in this stage + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + else + makeFlagsArray+=( + 'LIMITS_H_TEST=true' + ) + fi + fi + + eval "$oldOpts" + ''; + + preConfigure = (originalAttrs.preConfigure or "") + '' + if test -n "$newlibSrc"; then + tar xvf "$newlibSrc" -C .. + ln -s ../newlib-*/newlib newlib + # Patch to get armvt5el working: + sed -i -e 's/ arm)/ arm*)/' newlib/configure.host + fi + + # Bug - they packaged zlib + if test -d "zlib"; then + # This breaks the build without-headers, which should build only + # the target libgcc as target libraries. + # See 'configure:5370' + rm -Rf zlib + fi + + if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then + mkdir -p ../mingw + # --with-build-sysroot expects that: + cp -R $libcCross/include ../mingw + configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." + fi + + # Perform the build in a different directory. + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure + ''; + + postConfigure = '' + # Avoid store paths when embedding ./configure flags into gcc. + # Mangled arguments are still useful when reporting bugs upstream. + sed -e "/TOPLEVEL_CONFIGURE_ARGUMENTS=/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i Makefile + ''; + + preInstall = '' + mkdir -p "$out/''${targetConfig}/lib" + mkdir -p "''${!outputLib}/''${targetConfig}/lib" + '' + + # Make `lib64` symlinks to `lib`. + lib.optionalString (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) '' + ln -s lib "$out/''${targetConfig}/lib64" + ln -s lib "''${!outputLib}/''${targetConfig}/lib64" + '' + + # On mips platforms, gcc follows the IRIX naming convention: + # + # $PREFIX/lib = mips32 + # $PREFIX/lib32 = mips64n32 + # $PREFIX/lib64 = mips64 + # + # Make `lib32` symlinks to `lib`. + lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' + ln -s lib "$out/''${targetConfig}/lib32" + ln -s lib "''${!outputLib}/''${targetConfig}/lib32" + ''; + + postInstall = '' + # Move runtime libraries to lib output. + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "share/gcc-*/python" "''${!outputLib}" + + if [ -z "$enableShared" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" + fi + + for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + + if [ -n "$enableMultilib" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" + + for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + fi + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + + if type "install_name_tool"; then + for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi + + # Get rid of some "fixed" header files + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Two identical man pages are shipped (moving and compressing is done later) + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done + ''; +})) diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index e386693b22c7a..933a132ce4d1d 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -148,16 +148,3 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in '') -+ lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) '' - export linkLib64toLib=1 -'' - -# On mips platforms, gcc follows the IRIX naming convention: -# -# $PREFIX/lib = mips32 -# $PREFIX/lib32 = mips64n32 -# $PREFIX/lib64 = mips64 -# -+ lib.optionalString (!enableMultilib && targetPlatform.isMips64n32) '' - export linkLib32toLib=1 -'' diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 3d503c9b91399..ad4e913041583 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -73,12 +73,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index a721c243b46a6..f0d41a3ab7347 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -78,12 +78,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index acccb55c2f899..7ecd4efc08378 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -72,12 +72,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 5e06e85c02a94..a070e64c7ddd9 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -66,12 +66,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix index 901e41a58fa7a..976ff7580ac31 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -69,12 +69,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 0428e3a170cbb..6e968a6bd2a66 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -67,12 +67,13 @@ let substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 3efb3c02c79e9..baf601ffbfc2b 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -67,12 +67,13 @@ let substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index b044e16624266..c3f2bcb73ffef 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -79,12 +79,13 @@ let substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index d03178d6897ab..0d0af5ab6aa69 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -85,12 +85,13 @@ let substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index 4a48cb94c4ae5..75814fc11c481 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -80,12 +80,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 894db1a4975f6..733f5462d320c 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -81,12 +81,13 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/clang/ + mkdir -p $python/bin $python/share/{clang,scan-view} mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang + mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/rust/1_70.nix b/pkgs/development/compilers/rust/1_71.nix index 2a22c4643e55e..75780b55af819 100644 --- a/pkgs/development/compilers/rust/1_70.nix +++ b/pkgs/development/compilers/rust/1_71.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.70.0"; - rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw="; + rustcVersion = "1.71.1"; + rustcSha256 = "sha256-b6kNUNHVKadfbMNJeE3lfX7AuiQZsJvefTNcJb1ORy4="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -34,25 +34,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.69.0"; + bootstrapVersion = "1.70.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "08b2b4f58c0861f40ae159c39cc12f6d41b6858e04a43c6c0aeb36707e2971d0"; - x86_64-unknown-linux-gnu = "2ca4a306047c0b8b4029c382910fcbc895badc29680e0332c9df990fd1c70d4f"; - x86_64-unknown-linux-musl = "071cb04819b15d8801584a1395b28d0472ce99c0e716296e3c0bb4e6318cf171"; - arm-unknown-linux-gnueabihf = "64c82735b4e5606af61be0d01317da436a9590b969e503cdbd19e24636e15845"; - armv7-unknown-linux-gnueabihf = "a509f02d910041c97847e2ccc4ee908c761b7dc5b3c4715922d2b1c573a09675"; - aarch64-unknown-linux-gnu = "88af5aa7a40c8f1b40416a1f27de8ffbe09c155d933f69d3e109c0ccee92353b"; - aarch64-unknown-linux-musl = "76aaf3e4fd7b552feb2d70752c43896a960a2a7c940002f58a5c3f03d2b3c862"; - x86_64-apple-darwin = "9818dab2c3726d63dfbfde12c9273e62e484ef6d6f6e05a6431a3e089c335454"; - aarch64-apple-darwin = "36228cac303298243fb84235db87a5ecf2af49db28585a82af091caefd598677"; - powerpc64le-unknown-linux-gnu = "8ef68b77971c079dbe23b54a2cfb52da012873d96399c424bc223635306e9a58"; - riscv64gc-unknown-linux-gnu = "e1976bf7d0edb7e7789a1ad7ff8086fdb5306a932650fa8182a5d009883fa6c5"; - mips64el-unknown-linux-gnuabi64 = "c4bf3043451d6122a3845db825cbe35b5ca61a44659a00004f6cca1299ad9d72"; + i686-unknown-linux-gnu = "119dfd4ee3da6c8fc36444dd15a12187e1f9b34ee6792fb75a6a25d09ea7e865"; + x86_64-unknown-linux-gnu = "8499c0b034dd881cd9a880c44021632422a28dc23d7a81ca0a97b04652245982"; + x86_64-unknown-linux-musl = "d97c2ac1d9f17e754fa6b7d48c28531d16278547e3fa47050a01da037ddb6de3"; + arm-unknown-linux-gnueabihf = "ac98b513c31789d0c3201dfe2bbcc81b9437f7e1a15695d09402efec7934c20e"; + armv7-unknown-linux-gnueabihf = "23e6029c2a7363b307af539f0c81f4bb9f0ade12b588658343c8a8cfa41526ae"; + aarch64-unknown-linux-gnu = "3aa012fc4d9d5f17ca30af41f87e1c2aacdac46b51adc5213e7614797c6fd24c"; + aarch64-unknown-linux-musl = "6381de0b55f1741ac322bf1b56701d8aab4e509ff5302043941170f8df34228e"; + x86_64-apple-darwin = "e5819fdbfc7f1a4d5d82cb4c3b7662250748450b45a585433bfb75648bc45547"; + aarch64-apple-darwin = "75cbc356a06c9b2daf6b9249febda0f0c46df2a427f7cc8467c7edbd44636e53"; + powerpc64le-unknown-linux-gnu = "ba8cb5e3078b1bc7c6b27ab53cfa3af14001728db9a047d0bdf29b8f05a4db34"; + riscv64gc-unknown-linux-gnu = "5964f78e5fb30506101a929162a42be6260b887660b71592c5f38466753440c3"; + mips64el-unknown-linux-gnuabi64 = "de5fd0b249fbb95b9b67928ba08d7ec49f18f0ae25cbe1b0ede3c02390d7b93a"; }; - selectRustPackage = pkgs: pkgs.rust_1_70; + selectRustPackage = pkgs: pkgs.rust_1_71; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 1de90cdddacfc..bf03077f4aa82 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -56,7 +56,7 @@ rec { # binaries. The lib.rmeta object inside the ar archive should contain an # .rmeta section, but it is removed. Luckily, this doesn't appear to be an # issue for Rust builds produced by Nix. - dontStrip = stdenv.isDarwin; + dontStrip = true; setupHooks = ./setup-hook.sh; }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 7b924b9f8d4f6..53f7257ecfc58 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -75,6 +75,7 @@ in stdenv.mkDerivation rec { "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" + "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" @@ -149,10 +150,6 @@ in stdenv.mkDerivation rec { ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} - # Fix the configure script to not require curl as we won't use it - sed -i configure \ - -e '/probe_need CFG_CURL curl/d' - # Useful debugging parameter # export VERBOSE=1 '' + lib.optionalString (stdenv.targetPlatform.isMusl && !stdenv.targetPlatform.isStatic) '' diff --git a/pkgs/development/interpreters/perl/MakeMaker-cross.patch b/pkgs/development/interpreters/perl/MakeMaker-cross.patch deleted file mode 100644 index 40626c51f9bd1..0000000000000 --- a/pkgs/development/interpreters/perl/MakeMaker-cross.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2017-06-30 17:03:20.000000000 -0400 -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2018-02-28 10:06:37.031237946 -0500 -@@ -1267,7 +1267,12 @@ - my $value = shift; - return $value if $UNDER_CORE; - my $tvalue = ''; -- require B; -+ eval { -+ require B; -+ }; -+ if ($@) { -+ return $tvalue; -+ } - my $sv = B::svref_2object(\$value); - my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; - while ( $magic ) { diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch new file mode 100644 index 0000000000000..e0f05ede90d02 --- /dev/null +++ b/pkgs/development/interpreters/perl/cross.patch @@ -0,0 +1,250 @@ +From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de> +Date: Mon, 10 Apr 2023 22:12:24 +0200 +Subject: [PATCH] miniperl compatible modules + +CPAN::Meta +ExtUtils::MakeMaker +JSON::PP +Data::Dumper + +Updated for perl v5.38.0 by stig@stig.io + +--- + +diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm +index b0e83b0d2d..dab4907704 100644 +--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm ++++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm +@@ -86,21 +86,7 @@ sub new { + # from version::vpp + sub _find_magic_vstring { + my $value = shift; +- my $tvalue = ''; +- require B; +- my $sv = B::svref_2object(\$value); +- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; +- while ( $magic ) { +- if ( $magic->TYPE eq 'V' ) { +- $tvalue = $magic->PTR; +- $tvalue =~ s/^v?(.+)$/v$1/; +- last; +- } +- else { +- $magic = $magic->MOREMAGIC; +- } +- } +- return $tvalue; ++ return version::->parse($value)->stringify; + } + + # safe if given an unblessed reference +diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +index 746abd63bc..c55d7cd2d0 100644 +--- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm ++++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +@@ -1,6 +1,7 @@ + use 5.008001; # sane UTF-8 support + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + # XXX-INGY is 5.8.1 too old/broken for utf8? + # XXX-XDG Lancaster consensus was that it was sufficient until +@@ -650,27 +651,29 @@ sub _dump_string { + join '', map { "$_\n" } @lines; + } + +-sub _has_internal_string_value { ++# taken from cpan/JSON-PP/lib/JSON/PP.pm ++sub _looks_like_number { + my $value = shift; +- my $b_obj = B::svref_2object(\$value); # for round trip problem +- return $b_obj->FLAGS & B::SVf_POK(); ++ no warnings 'numeric'; ++ # if the utf8 flag is on, it almost certainly started as a string ++ return if utf8::is_utf8($value); ++ # detect numbers ++ # string & "" -> "" ++ # number & "" -> 0 (with warning) ++ # nan and inf can detect as numbers, so check with * 0 ++ return unless length((my $dummy = "") & $value); ++ return unless 0 + $value eq $value; ++ return 1 if $value * 0 == 0; ++ return -1; # inf/nan + } + + sub _dump_scalar { + my $string = $_[1]; + my $is_key = $_[2]; +- # Check this before checking length or it winds up looking like a string! +- my $has_string_flag = _has_internal_string_value($string); + return '~' unless defined $string; + return "''" unless length $string; +- if (Scalar::Util::looks_like_number($string)) { +- # keys and values that have been used as strings get quoted +- if ( $is_key || $has_string_flag ) { +- return qq['$string']; +- } +- else { +- return $string; +- } ++ if (_looks_like_number($string)) { ++ return qq['$string']; + } + if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { + $string =~ s/\\/\\\\/g; +@@ -800,9 +803,6 @@ sub errstr { + # Helper functions. Possibly not needed. + + +-# Use to detect nv or iv +-use B; +- + # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? + # Some platforms can't flock :-( + # XXX-XDG I think it is. When reading and writing files, we ought +@@ -822,35 +822,8 @@ sub _can_flock { + } + } + +- +-# XXX-INGY Is this core in 5.8.1? Can we remove this? +-# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this +-##################################################################### +-# Use Scalar::Util if possible, otherwise emulate it +- +-use Scalar::Util (); + BEGIN { +- local $@; +- if ( eval { Scalar::Util->VERSION(1.18); } ) { +- *refaddr = *Scalar::Util::refaddr; +- } +- else { +- eval <<'END_PERL'; +-# Scalar::Util failed to load or too old +-sub refaddr { +- my $pkg = ref($_[0]) or return undef; +- if ( !! UNIVERSAL::can($_[0], 'can') ) { +- bless $_[0], 'Scalar::Util::Fake'; +- } else { +- $pkg = undef; +- } +- "$_[0]" =~ /0x(\w+)/; +- my $i = do { no warnings 'portable'; hex $1 }; +- bless $_[0], $pkg if defined $pkg; +- $i; +-} +-END_PERL +- } ++ *refaddr = *builtin::refaddr; + } + + delete $CPAN::Meta::YAML::{refaddr}; +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +index 3604eae402..991f69d275 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +@@ -1,12 +1,13 @@ + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + package CPAN::Meta::Merge; + + our $VERSION = '2.150010'; + + use Carp qw/croak/; +-use Scalar::Util qw/blessed/; ++use builtin qw/blessed/; + use CPAN::Meta::Converter 2.141170; + + sub _is_identical { +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +index d4e93fd8a5..809da68d02 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +@@ -1,6 +1,7 @@ + use 5.006; + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::Prereqs; + + our $VERSION = '2.150010'; +@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; + #pod =cut + + use Carp qw(confess); +-use Scalar::Util qw(blessed); + use CPAN::Meta::Requirements 2.121; + + #pod =method new +@@ -168,7 +168,12 @@ sub types_in { + sub with_merged_prereqs { + my ($self, $other) = @_; + +- my @other = blessed($other) ? $other : @$other; ++ eval 'require Scalar::Util'; ++ my @other = unless($@){ ++ Scalar::Util::blessed($other) ? $other : @$other; ++ }else{ ++ builtin::blessed($other) ? $other : @$other; ++ } + + my @prereq_objs = ($self, @other); + +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -4,6 +4,7 @@ package JSON::PP; + + use 5.008; + use strict; ++no warnings 'experimental::builtin'; + + use Exporter (); + BEGIN { our @ISA = ('Exporter') } +diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm +index bb6d3caedb..0c2fde4743 100644 +--- a/dist/Data-Dumper/Dumper.pm ++++ b/dist/Data-Dumper/Dumper.pm +@@ -11,6 +11,7 @@ package Data::Dumper; + + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + #$| = 1; + +@@ -125,8 +126,7 @@ sub new { + # Packed numeric addresses take less memory. Plus pack is faster than sprintf + + sub format_refaddr { +- require Scalar::Util; +- pack "J", Scalar::Util::refaddr(shift); ++ pack "J", builtin::refaddr(shift); + }; + + # +@@ -282,9 +282,8 @@ sub _dump { + warn "WARNING(Freezer method call failed): $@" if $@; + } + +- require Scalar::Util; +- my $realpack = Scalar::Util::blessed($val); +- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; ++ my $realpack = builtin::blessed($val); ++ my $realtype = $realpack ? builtin::reftype($val) : ref $val; + $id = format_refaddr($val); + + # Note: By this point $name is always defined and of non-zero length. +@@ -576,7 +575,7 @@ sub _dump { + # here generates a different result. So there are actually "three" different + # implementations of Data::Dumper (kind of sort of) but we only test two. + elsif (!defined &_vstring +- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { ++ and ref $ref eq 'VSTRING') { + $out .= sprintf "v%vd", $val; + } + # \d here would treat "1\x{660}" as a safe decimal number diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3c57d8a2b6900..a2f9862083c98 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -58,18 +58,18 @@ let in rec { # Maint version - perl534 = callPackage ./intepreter.nix { - self = perl534; - version = "5.34.1"; - sha256 = "sha256-NXlRpJGwuhzjYRJjki/ux4zNWB3dwkpEawM+JazyQqE="; + perl536 = callPackage ./intepreter.nix { + self = perl536; + version = "5.36.1"; + sha256 = "sha256-aCA2Zdjs4CmI/HfckvzLspeoOku0uNB1WEQvl42lTME="; inherit passthruFun; }; # Maint version - perl536 = callPackage ./intepreter.nix { - self = perl536; - version = "5.36.0"; - sha256 = "sha256-4mCFr4rDlvYq3YpTPDoOqMhJfYNvBok0esWr17ek4Ao="; + perl538 = callPackage ./intepreter.nix { + self = perl538; + version = "5.38.0"; + sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; @@ -77,8 +77,8 @@ in rec { perldevel = callPackage ./intepreter.nix { self = perldevel; perlAttr = "perldevel"; - version = "5.37.0"; - sha256 = "sha256-8RQO6gtH+WmghqzRafbqAH1MhKv/vJCcvysi7/+T9XI="; + version = "5.38.0"; + sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; } diff --git a/pkgs/development/interpreters/perl/intepreter.nix b/pkgs/development/interpreters/perl/intepreter.nix index 96d6430c14e23..c16dffe3db697 100644 --- a/pkgs/development/interpreters/perl/intepreter.nix +++ b/pkgs/development/interpreters/perl/intepreter.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation (rec { disallowedReferences = [ stdenv.cc ]; patches = - [ - # Do not look in /usr etc. for dependencies. - ./no-sys-dirs-5.31.patch + # Enable TLS/SSL verification in HTTP::Tiny by default + lib.optional (lib.versionOlder version "5.38.0") ./http-tiny-verify-ssl-by-default.patch + + # Do not look in /usr etc. for dependencies. + ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch + ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch - # Enable TLS/SSL verification in HTTP::Tiny by default - ./http-tiny-verify-ssl-by-default.patch - ] ++ lib.optional stdenv.isSunOS ./ld-shared.patch ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ lib.optional crossCompiling ./MakeMaker-cross.patch; + ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -123,7 +123,7 @@ stdenv.mkDerivation (rec { dontAddPrefix = !crossCompiling; - enableParallelBuilding = !crossCompiling; + enableParallelBuilding = false; # perl includes the build date, the uname of the build system and the # username of the build user in some files. @@ -150,6 +150,7 @@ stdenv.mkDerivation (rec { LIB = ${zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT + USE_ZLIB_NG = False EOF '' + lib.optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" @@ -235,14 +236,14 @@ stdenv.mkDerivation (rec { mainProgram = "perl"; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 + crossVersion = "1.5"; # Jul 03, 2023 perl-cross-src = fetchFromGitHub { - name = "perl-cross-unstable-${crossVersion}"; + name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-m9UCoTQgXBxSgk9Q1Zv6wl3Qnd0aZm/jEPXkcMKti8U="; + sha256 = "sha256-9nRFJinZUWUSpXXyyIVmhRLQ1B5LB3UmN2iAckmem58="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch new file mode 100644 index 0000000000000..c959730d14208 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch @@ -0,0 +1,256 @@ +diff --git a/Configure b/Configure +index e261cb9548..3bbbc4b9df 100755 +--- a/Configure ++++ b/Configure +@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1455,8 +1447,7 @@ groupstype='' + i_whoami='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1470,17 +1461,12 @@ DEBUGGING='' + archobjs='' + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2581,7 +2565,6 @@ uname + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -5023,7 +5006,7 @@ esac + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8860,13 +8843,8 @@ esac + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -21500,9 +21478,10 @@ $rm_try tryp + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL +index ae647d5f06..9a05d66592 100644 +--- a/ext/Errno/Errno_pm.PL ++++ b/ext/Errno/Errno_pm.PL +@@ -135,12 +135,7 @@ sub get_files { + if ($dep =~ /(\S+errno\.h)/) { + push(@file, $1); + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i && +- # might be using, say, Intel's icc +- $linux_errno_h +- ) { ++ } elsif (0) { + push(@file, $linux_errno_h); + } elsif ($^O eq 'haiku') { + # hidden in a special place +diff --git a/hints/freebsd.sh b/hints/freebsd.sh +index 4d26835e99..c6d365d84d 100644 +--- a/hints/freebsd.sh ++++ b/hints/freebsd.sh +@@ -127,21 +127,21 @@ case "$osvers" in + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff --git a/hints/linux.sh b/hints/linux.sh +index e1508c7509..5a187c583a 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -150,28 +150,6 @@ case "$optimize" in + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Ubuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-# clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then +- gcc=${cc:-cc} +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -208,32 +186,6 @@ case "$usequadmath" in + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -311,33 +263,6 @@ sparc*) + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f84cca760f860..6369750c4b6f3 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -439,6 +439,7 @@ in with passthru; stdenv.mkDerivation { ln -s "$out/bin/python3" "$out/bin/python" ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + ln -sL "$out/share/man/man1/python3.1.gz" "$out/share/man/man1/python.1.gz" # Get rid of retained dependencies on -dev packages, and remove # some $TMPDIR references to improve binary reproducibility. diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 001e477b9185b..bd29d493ebb8c 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -62,6 +62,16 @@ in { }; } ./pip-build-hook.sh) {}; + pypaBuildHook = callPackage ({ makePythonHook, build, wheel }: + makePythonHook { + name = "pypa-build-hook.sh"; + propagatedBuildInputs = [ build wheel ]; + substitutions = { + inherit pythonInterpreter; + }; + } ./pypa-build-hook.sh) {}; + + pipInstallHook = callPackage ({ makePythonHook, pip }: makePythonHook { name = "pip-install-hook"; @@ -160,6 +170,20 @@ in { }; } ./setuptools-check-hook.sh) {}; + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + makePythonHook { + name = "setuptools-rust-setup-hook"; + propagatedBuildInputs = [ setuptools-rust ]; + substitutions = { + pyLibDir = "${python}/lib/${python.libPrefix}"; + cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; + cargoLinkerVar = lib.toUpper ( + builtins.replaceStrings ["-"] ["_"] ( + rust.toRustTarget stdenv.hostPlatform)); + targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + }; + } ./setuptools-rust-hook.sh) {}; + unittestCheckHook = callPackage ({ makePythonHook }: makePythonHook { name = "unittest-check-hook"; diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 745f02e8c9bc3..9de4c7d1dd0dd 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,13 +1,22 @@ # Setup hook to use for pip projects echo "Sourcing pip-build-hook" +declare -a pipBuildFlags + pipBuildPhase() { echo "Executing pipBuildPhase" runHook preBuild mkdir -p dist echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + @pythonInterpreter@ -m pip wheel \ + --verbose \ + --no-index \ + --no-deps \ + --no-clean \ + --no-build-isolation \ + --wheel-dir dist \ + $pipBuildFlags . echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh new file mode 100644 index 0000000000000..3b71300497691 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -0,0 +1,19 @@ +# Setup hook to use for pypa/build projects +echo "Sourcing pypa-build-hook" + +pypaBuildPhase() { + echo "Executing pypaBuildPhase" + runHook preBuild + + echo "Creating a wheel..." + @pythonInterpreter@ -m build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + echo "Finished creating a wheel..." + + runHook postBuild + echo "Finished executing pypaBuildPhase" +} + +if [ -z "${dontUsePypaBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using pypaBuildPhase" + buildPhase=pypaBuildPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh new file mode 100644 index 0000000000000..917c19ef9b31b --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh @@ -0,0 +1,18 @@ +echo "Sourcing setuptools-rust-hook" + +setuptoolsRustSetup() { + # This can work only if rustPlatform.cargoSetupHook is also included + if ! command -v cargoSetupPostPatchHook >/dev/null; then + echo "ERROR: setuptools-rust has to be used alongside with rustPlatform.cargoSetupHook!" + exit 1 + fi + + export PYO3_CROSS_LIB_DIR="@pyLibDir@" + export CARGO_BUILD_TARGET=@cargoBuildTarget@ + # TODO theoretically setting linker should not be required because it is + # already set in pkgs/build-support/rust/hooks/default.nix but build fails + # on missing linker without this. + export CARGO_TARGET_@cargoLinkerVar@_LINKER=@targetLinker@ +} + +preConfigureHooks+=(setuptoolsRustSetup) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index dcfe4a4ef27b8..93f33531b5e86 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -14,8 +14,10 @@ mkDerivation rec { propagatedBuildInputs = [ glib libaccounts-glib ]; nativeBuildInputs = [ doxygen pkg-config qmake ]; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = '' + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* + ''; meta = with lib; { description = "Qt library for accessing the online accounts database"; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index c1b0baa489f77..a7acff5fa3d58 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -45,10 +45,11 @@ stdenv.mkDerivation rec { ninja pkg-config gi-docgen + gobject-introspection ] ++ lib.optional enableViewer wrapGAppsHook; buildInputs = - [ glib libxml2 gobject-introspection ] + [ glib libxml2 ] ++ lib.optional enableUsb libusb1 ++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ]) ++ lib.optionals (enableViewer) [ gtk3 ]; diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/development/libraries/arrow-glib/default.nix index 9c396f89d11cb..2e283d3c52ef2 100644 --- a/pkgs/development/libraries/arrow-glib/default.nix +++ b/pkgs/development/libraries/arrow-glib/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gobject-introspection ]; buildInputs = [ arrow-cpp glib - gobject-introspection ]; meta = with lib; { diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 3de4ed8e774a5..45dceb3934574 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -43,6 +43,13 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; + postFixup = '' + # remove once updated to 0.6.15 or above + for f in $dev/lib/pkgconfig/*; do + echo "Requires: lv2 >= 1.18.4, serd-0 >= 0.30.10, sord-0 >= 0.16.10" >> "$f" + done + ''; + passthru = { updateScript = writeScript "update-sratom" '' #!/usr/bin/env nix-shell diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index fa170ba2b9693..7a57315a5f4da 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.26"; + version = "0.7.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-PvdkTw5JydJT0TbXLB2C9tk4T+ho+fAbaw4jU9m5KuU="; + sha256 = "sha256-DzUobQ8qZNb83CwVKK9E1V51uHHo22nlBGKdN55W7UY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 3abca93780607..a76ee7ab003cf 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.21"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WMCLVwRrgwFsaqoKtbQNt0bHVYi1LUZt5r0i3oAfWFE="; + sha256 = "sha256-qsYQViMto5j6piCg6gBjzFfPJlLkJt4949o217QsV6Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 93ac1df046526..1df8bef5be129 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.15"; + version = "0.8.23"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AemFZZwfHdjqX/sXUw1fpusICOa3C7rT6Ofsz5bGYOQ="; + sha256 = "sha256-HkRaQnlasayg5Nu2KaEA18360rxAH/tdJ1iqzoi6i2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index ecbd7238ced70..cc486bc3e6d78 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-compression"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; rev = "v${version}"; - sha256 = "sha256-aQ5UsMms8aJh5yrE9of1AQgIGTAk9vyBRaybwYqUY68="; + sha256 = "sha256-XtmSThfz4Cu7CygYrLNQifDCQ6l/c/0OR0lX+OxCYJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index fb857a3f316ca..6b3c8af43f50c 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.20"; + version = "0.3.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UDACkGqTtyLablSzePMmMk4iGpgfdtZU/SEv0RCSFfA="; + sha256 = "sha256-2MPTr1vSUPuemdlQIalZTp6eGXJl3Xr1eUEnZjikBzg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 8cb2703147ef4..045f5f97a8064 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.7.6"; + version = "0.7.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-pJGzGbIuz8UJkfmTQEZgXSOMuYixMezNZmgaRlcnmfg="; + sha256 = "sha256-gKuWhXxWHqTS66yANdKLsCZRk7jeDmyYMlme4WXT5Wc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 041edf2a52200..e1eb1939c2126 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.19"; + version = "0.13.29"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6lTAnoBWbwyWpycsaS7dpCC9c4xYws19HCNyTd7aRho="; + sha256 = "sha256-ZeogbjgpbqdCioLeb34CRol1Fa5BJOloAxxgE50yfQs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 5f3fda00c52a3..082887ee3a3d9 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.8"; + version = "0.8.14"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-bt5Qjw+CqgTfi/Ibhc4AwmJxr22Q6m3ygpmeMhvQTT0="; + sha256 = "sha256-LPhd4ygh/3BtqDZwWtigXWUGZ0fzkcWkFl6dpJIspow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 97c7083c669a7..ca07b930109ee 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.2.8"; + version = "0.3.13"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-kwYzsKdEy+e0GxqYcakcdwoaC2LLPZe8E7bZNrmqok0="; + sha256 = "sha256-SXMDyzQ8hjPx9q9GhE11lYjj3IZY35mvUWELlYQmgGU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index ed931a1190a3b..df43976e6cf00 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-iKHO8awWWB8tvYCr+/R6hhK8a/PnanYYEAJ7zNOJC3w="; + sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index bfbc163c16239..722c77f32de64 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.14"; + version = "0.1.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yoViXJuM9UQMcn8W0CcWkCXroBLXjAestr+oqWHi5hQ="; + sha256 = "sha256-OoEwubEEkLJmlqmQR4/rp4+b1WYJEbcjYDSdXXHleZQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 5928b5eaf8c75..0f44dab59db4b 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.20.2"; + version = "0.20.3"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-6oRVAL4pn+1+/LqLijKiBV6fZy3k9fZySwMwYHB1aUY="; + sha256 = "sha256-70AchkuhuyumwpBYaj9mOVPJ8+6VSLTLtr3ghwqG3wM="; }; patches = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 68ea441228365..8fdb63f165e84 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.37"; + version = "1.11.118"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-C1PdLNagoIMk9/AAV2Pp7kWcspasJtN9Tx679FnEprc="; + sha256 = "sha256-jqGXh8xLD2gIjV9kSvlldrxA5TxTTXQoC/B66FVprvk="; }; patches = [ @@ -38,6 +38,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Append the dev output to path hints in finding Aws.h to avoid + # having to pass `AWS_CORE_HEADER_FILE` explicitly to cmake configure + # when using find_package(AWSSDK CONFIG) + substituteInPlace cmake/AWSSDKConfig.cmake \ + --replace 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core' \ + 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "${placeholder "dev"}/include/aws/core' + # Avoid blanket -Werror to evade build failures on less # tested compilers. substituteInPlace cmake/compiler_settings.cmake \ diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index cad0f3aaed690..5de26ef5ce2b9 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -134,6 +134,14 @@ stdenv.mkDerivation { relative = "include"; hash = "sha256-dq4SVgxkPJSC7Fvr59VGnXkM4Lb09kYDaBksCHo9C0s="; }) + # This fixes an issue in Python 3.11 about Py_TPFLAGS_HAVE_GC + (fetchpatch { + name = "python311-compatibility.patch"; + url = "https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013.patch"; + hash = "sha256-IHxLtJBx0xSy7QEr8FbCPofsjcPuSYzgtPwDlx1JM+4="; + stripLen = 1; + extraPrefix = "libs/python/"; + }) ]; meta = with lib; { diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 877296334fe4c..a25ca5b97dff9 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -9,26 +9,18 @@ , python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "loco-3d"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wDHCHTJXmJjU7mhQ2huUVdEc9ap7PMeqlHPrKm//jBQ="; + hash = "sha256-h7rzLSvmWOZCP8rvmUEhFeMEiPhojfbvkt+fNKpgoXo="; }; - patches = [ - # error: no matching function for call to 'max(double&, int)' - (fetchpatch { - url = "https://github.com/loco-3d/crocoddyl/commit/d2e4116257595317740975e745739bb76b92e5c0.patch"; - hash = "sha256-M79jNdIxzx9PfW3TStRny76dVo/HDf/Rp08ZPx+ymBg"; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -48,11 +40,26 @@ stdenv.mkDerivation rec { "-DBUILD_PYTHON_INTERFACE=OFF" ]; + prePatch = '' + substituteInPlace \ + examples/CMakeLists.txt \ + examples/log/check_logfiles.sh \ + --replace /bin/bash ${stdenv.shell} + ''; + + doCheck = true; + pythonImportsCheck = [ + "crocoddyl" + ]; + checkInputs = lib.optionals (pythonSupport) [ + python3Packages.scipy + ]; + meta = with lib; { description = "Crocoddyl optimal control library"; homepage = "https://github.com/loco-3d/crocoddyl"; license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 1c0d360e4f45b..a6983decf33f5 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -4,6 +4,7 @@ , ninja , pkg-config , fetchFromGitHub +, fetchpatch , dleyna-core , glib }: @@ -19,6 +20,17 @@ stdenv.mkDerivation rec { sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; }; + patches = [ + # Fix build with meson 1.2. We use the gentoo patch intead of the + # usptream one because the latter only applies on the libsoup_3 based + # merged dLeyna project. + # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 + (fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; + sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 2e3438e3d98fc..61574df27c19d 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -27,6 +28,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw="; }; + patches = [ + # Fix build with meson 1.2. We use the gentoo patch intead of the + # usptream one because the latter only applies on the libsoup_3 based + # merged dLeyna project. + # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 + (fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch"; + sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 3142f9657cd8a..cec03d84c6499 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , makeWrapper @@ -25,6 +26,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME="; }; + patches = [ + # Fix build with meson 1.2. We use the gentoo patch intead of the + # usptream one because the latter only applies on the libsoup_3 based + # merged dLeyna project. + # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 + (fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch"; + sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index b8ec7227c612e..201275fb02ef2 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -6,16 +6,16 @@ , python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.0.7"; + version = "4.0.8"; src = fetchFromGitHub { owner = "Gepetto"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-dN23ukKPkTohqD1J/0EneLyG6Cg0zriMr1l6WLFemd8="; + hash = "sha256-xeNbx1f9QCAOJrXfkk3jo9XH2/4HNtnRA1OSnqA2cLs="; }; strictDeps = true; @@ -32,11 +32,16 @@ stdenv.mkDerivation rec { "-DBUILD_PYTHON_INTERFACE=OFF" ]; + doCheck = true; + pythonImportsCheck = [ + "example_robot_data" + ]; + meta = with lib; { description = "Set of robot URDFs for benchmarking and developed examples."; homepage = "https://github.com/Gepetto/example-robot-data"; license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index f4eac39919f25..59ab572762ee4 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, fetchpatch +, libpulseaudio +, audioBackend ? "pulseaudio" +}: + +assert lib.assertOneOf "audioBackend" audioBackend [ "alsa" "pulseaudio" ]; stdenv.mkDerivation rec { pname = "flite"; @@ -11,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ]; + buildInputs = lib.optional (stdenv.isLinux && audioBackend == "alsa") alsa-lib + ++ lib.optional (stdenv.isLinux && audioBackend == "pulseaudio") libpulseaudio; # https://github.com/festvox/flite/pull/60. # Replaces `ar` with `$(AR)` in config/common_make_rules. @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop @@ -35,6 +45,7 @@ stdenv.mkDerivation rec { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d96b0e14013c2..f4a81633f54b3 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.0"; + version = "2.13.1"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-XuI6vQR2NsJLLUPGYl3K/GZmHRrKZN7J4NBd8pWSYkw="; + sha256 = "sha256-6mfjsBmxEE0WZ6onT13DB9jL1gazmbwy3zCKd/GlZL8="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fad65d7dd4ced..17ef806ec9ad7 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail + nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython gobject-introspection ]; + buildInputs = [ atk dbus evemu frame gdk-pixbuf grail gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 4bad33000c069..c2bf28d710452 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { json-glib libsoup_3 avahi - gobject-introspection ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf ] ++ lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a8e8fde96f630..ec929272dea0e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -54,9 +54,13 @@ stdenv.mkDerivation rec { xz xz.bin ]; - buildInputs = [ bash ] - # HACK, see #10874 (and 14664) - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ + bash + ] + ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + # HACK, see #10874 (and 14664) + libiconv + ]; setupHooks = [ ../../../build-support/setup-hooks/role.bash diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 5202dc0edabc4..8c8a587ed5480 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,8 +1,15 @@ -{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, fixDarwinDylibNames +, pkgsStatic +}: stdenv.mkDerivation rec { pname = "giflib"; version = "5.2.1"; + src = fetchurl { url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz"; sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; @@ -14,33 +21,48 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; }) - ] ++ lib.optional stdenv.hostPlatform.isDarwin + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # https://sourceforge.net/p/giflib/bugs/133/ (fetchpatch { - # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; url = "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"; sha256 = "12afkqnlkl3n1hywwgx8sqnhp3bz0c5qrwcv8j9hifw1lmfhv67r"; extraPrefix = "./"; - }); - - postPatch = '' - substituteInPlace Makefile \ - --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' - '' - # Upstream build system does not support NOT building shared libraries. - + lib.optionalString stdenv.hostPlatform.isStatic '' + }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # Build dll libraries. + (fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=4cf1e519bcf51338dc607d23388fca47d71790c0"; + sha256 = "KyJi3eqH/Ae+guEK6znraZI5+IPImaoYoW5NTkCvjsg="; + }) + + # Install executables. + ./mingw-install-exes.patch + ]; + + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + + makeFlags = [ + "PREFIX=${builtins.placeholder "out"}" + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + # Upstream build system does not support NOT building shared libraries. sed -i '/all:/ s/libgif.so//' Makefile sed -i '/all:/ s/libutil.so//' Makefile sed -i '/-m 755 libgif.so/ d' Makefile sed -i '/ln -sf libgif.so/ d' Makefile ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - - passthru.tests.static = pkgsStatic.giflib; + passthru.tests = { + static = pkgsStatic.giflib; + }; meta = { description = "A library for reading and writing gif images"; + homepage = "https://giflib.sourceforge.net/"; platforms = lib.platforms.unix; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/giflib/mingw-install-exes.patch b/pkgs/development/libraries/giflib/mingw-install-exes.patch new file mode 100644 index 0000000000000..5ec3fdad7e654 --- /dev/null +++ b/pkgs/development/libraries/giflib/mingw-install-exes.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -92,7 +92,7 @@ + install: all install-bin install-include install-lib install-man + install-bin: $(INSTALLABLE) + $(INSTALL) -d "$(DESTDIR)$(BINDIR)" +- $(INSTALL) $^ "$(DESTDIR)$(BINDIR)" ++ $(INSTALL) $(^:=.exe) "$(DESTDIR)$(BINDIR)" + install-include: + $(INSTALL) -d "$(DESTDIR)$(INCDIR)" + $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index bab58c887e5e6..6af608995c2f5 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-JaV4Wl2jVmiQAUQJJrlOln0C4TxJ63dD417wzyLkJ1A="; + hash = "sha256-QW4XThZXNNhIBiU/jJa9opk/0H8ljDqtXwU6bv1GPog="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index f10d90a0454b4..276f2d192ef7d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-6q9TIkVl6qvVBco5xtV2lxm0V5XPUyzhzrYOGy6+maw="; + hash = "sha256-5k51za/X/y/H/DToVbBrHj7SJ8wG+jeNF7vNdngMM4w="; }; patches = [ @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection gst-plugins-base orc json-glib diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 1b8d569f56ace..449873bc7c58b 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-KSQk6C3qFwUoxCtFb2KolTK8q8BQjxkuNGcvuG9o5bg="; + hash = "sha256-7dQzi0XCapryjA01qrlkoCTDiEum9SDYQo3wQhLIyTo="; }; strictDeps = true; @@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gobject-introspection graphene orc libtheora diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 1478e96120fc7..ed7396f291cc2 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-EcsEmLwWuT2LmdIvdfgpuNCr/YJUhAshIGGNtVMtxlU="; + hash = "sha256-RAjXkw84GAnoWReswZcS8XMmG6hb3yDFVnsqIbEZO2E="; }; depsBuildBuild = [ @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash-completion - gobject-introspection ] ++ lib.optionals stdenv.isLinux [ libcap libunwind diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index b194d6e827533..5b1396f35d51a 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-TFIFPOjB33L9gXIen1PeOxRu3PLeKPYHvnBbzkz5CdE="; + hash = "sha256-Kt0VGapu6wHVRMuUKTaI7jvCB59rymB1v1wj0AoJIb4="; }; outputs = [ @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { cairo python3 json-glib - gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index cc1244b1ecaea..a8bbb63205554 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RThGz6RxoMHIAUVRvUhPvPM08ORDBZIxevuyN3Xmm9I="; + hash = "sha256-vM3TvWHYaCmxbODiBtthsz95SsF5JCP558xl110aMbU="; }; nativeBuildInputs = [ @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion libxml2 - gobject-introspection gst-devtools python3 ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index bf847987a029d..f967e2e0ce1b2 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , meson , nasm , ninja @@ -51,15 +52,26 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-1xIMEUap1yPVPVv+gHTaJXWoHwWYQ4dSk385u3yDO2o="; + hash = "sha256-tnsxMTpUxpKbgpadQdPP3y9Y21c/tfSR5rul2ErqB3g="; }; + # TODO: Patch is conditional to spare rebuilds during the current staging-next cycle and should be removed during the next bump + patches = lib.optionals qt5Support [ + # Needed until https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083 is merged and released + (fetchpatch { + name = "gst-plugins-good-fix-qt5-without-viv-fb.patch"; + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/03d8ef0b7c6e70eb936de0514831c1aafc763dcf.diff"; + hash = "sha256-17XU/W/TMPg5669O1EBXByAN/VwFu/0idTg5ze3M/D4="; + stripLen = 2; + }) + ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c2fee6d1ea6b1..2309e8717e2b2 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-mnUbx0Dedo55HDepXwqSTGpB0S/X839UzmpOg0vhItM="; + hash = "sha256-hYPwwfT8sB7tEfoePCESZUOovXOe1Pwdsx91alqwHZo="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 6cafa2b6daeb2..885726ee2ac73 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RmZhLXqZxg3NbwvbobenTSVioFAbKj4FdvCRa/HYgRs="; + hash = "sha256-80PrVJZOvU2MBxvl7srVhvKP6wFW4DbgaxSNDn/rscA="; }; outputs = [ @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gst-plugins-bad - gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index e4fa679d9d24e..2392d7f341d73 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.4"; + version = "1.22.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-/7Rh/abAbTFsS+VoJjLMiQFFTtcrEJix4CIbxV5nPNc="; + hash = "sha256-JoBHOyGBWPGEZ8rD4cUCkbf/TgcQ3TUKWeqsvCnAmlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a8f4cb166cf39..c5d400048dfc0 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-lnuONT2C0AgaaNxTY5sl2ftMqJv6HgYUA+DNfSNYW6Y="; + hash = "sha256-qaVQJnyVhN8OjHBDTTBHbo/QAYtzPBwe4z3q9CK9sks="; }; outputs = [ diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index e4318ebe61935..2efbf85d47c72 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ libtool gnome.gnome-common gtk-doc gtk2 - lua gobject-introspection + lua ]; configureFlags = [ "--disable-python" ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 70bd3d384deba..e3f91c3d827c6 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config python3 + gobject-introspection ]; buildInputs = [ glib - gobject-introspection gtk-doc libtool libxml2 diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 37eeb73f91cd7..969b5d9636f2f 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; meta = { description = "Library reading dwg files"; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index d177f7369a042..ffc33d0247d15 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libusb-compat-0_1 ]; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: @@ -31,6 +29,15 @@ stdenv.mkDerivation rec { --replace "ifdef USB_CLASS_PTP" "if 0" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; + meta = { description = "A library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 3d7b6ff9e012c..9c04e9b4058f7 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , python3 @@ -19,16 +20,29 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.6.4"; + version = "1.7.0"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0="; + hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ="; }; + patches = [ + (fetchpatch { + name = "darwin-errSSLNetworkTimeout.patch"; + url = "https://github.com/libgit2/libgit2/commit/3e15292d8863da316a57be23fede04f443460686.patch"; + hash = "sha256-N314YK7osO9L3hCXb+FcMoDM8iBW9Bt8D5O2Szdz7YA="; + }) + (fetchpatch { + name = "missing-git_oidarray.patch"; + url = "https://github.com/libgit2/libgit2/commit/085a169c1d73e02888708652d7772b3bc1f1b28b.diff"; + hash = "sha256-l6q1TLuOloyk0Jqvo5Npv4grU/oxlg+RFLa43qENaLI="; + }) + ]; + cmakeFlags = [ "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 371708d81fa25..afbbf69966bd8 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub }: +{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-bQtfye+gn7GOyzCtji4st5hsV40rPzuaYDP7N1tZ8wg="; + hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY="; }; + patches = lib.optionals (with stdenv; isAarch64 && isLinux) [ # conditional, temporarily + # backport for compilation issue on aarch64 + # https://github.com/google/highway/issues/1613 + (fetchpatch { + url = "https://github.com/google/highway/commit/7ad89efa911cb906ccf3f78fe510db415e921801.diff"; + hash = "sha256-hTSkeCh2QLMqeIKG/CAqJXaPqD/66Z02gjGXk591f+U="; + }) + ]; nativeBuildInputs = [ cmake ninja ]; @@ -29,6 +37,14 @@ stdenv.mkDerivation rec { "-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "-DHWY_CMAKE_ARM7=ON" + ] ++ lib.optionals stdenv.hostPlatform.isx86_32 [ + # Quoting CMakelists.txt: + # This must be set on 32-bit x86 with GCC < 13.1, otherwise math_test will be + # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. + # Fixes tests: + # HwyMathTestGroup/HwyMathTest.TestAllAtanh/EMU128 + # HwyMathTestGroup/HwyMathTest.TestAllLog1p/EMU128 + "-DHWY_CMAKE_SSE2=ON" ]; # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 2cef20fdcbd41..9b3de39e5d919 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-W7Hvc2zkmR6FdPGsymWXtm66BiHLcW9r7mywHjabeLc="; + sha256 = "sha256-RuahOkDLbac9bhXn8QSf7lMRw11PIpXQo3eaQ9N4Rtc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 5ba2ecc5d6bc0..efd914ca7b106 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { (stdenv.hostPlatform.libc == "glibc") "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; - buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; + buildInputs = [ gettext glib libxml2 gnome-common ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ]; meta = with lib; { description = "An interface library to access tags for identifying languages"; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 6cff9e3f03aa9..23cb00618055f 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ]; buildInputs = [ libtool - gobject-introspection glib gtk2 gtk-doc clutter clutter-gtk ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 281aff548c8b6..8618986195e82 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation (rec { - version = "4.12.0"; + version = "4.13.0"; pname = "libpfm"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; - sha256 = "sha256-SwwfU/OaYVJbab6/UyxoBAwbmE11RKiuCESxPNkeHuQ="; + sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; makeFlags = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9974826573a7d..6419f5a595786 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.56.2"; + version = "2.56.3"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - sha256 = "PsPE2Pc+C6S5EwAmlp6DccCStzQpjTbi/bPrSvzsEgA="; + hash = "sha256-WjKASKAtAUZFzSf2EUD04LESgPssfyohhk/gxZrBzog="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-GIEpZ5YMvmYQLcaLXseXQ6gIF7ICtUKq28JCVJ3PEYk="; + hash = "sha256-s7eNMSdajr2VhB/BPVUFftHhHKCqpR9sTfxfWwag1mI="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; @@ -141,18 +141,19 @@ stdenv.mkDerivation (finalAttrs: { ''; # Not generated when cross compiling. - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' - # Merge gdkpixbuf and librsvg loaders - cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp - mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache - - mkdir -p "$out/share/bash-completion/completions/" - $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" - mkdir -p "$out/share/zsh/site-functions/" - $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" - mkdir -p "$out/share/fish/vendor_completions.d/" - $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" - ''; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + # Merge gdkpixbuf and librsvg loaders + cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + ${emulator} $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + ${emulator} $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + ${emulator} $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" + ''; postFixup = lib.optionalString withIntrospection '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index eceaf8c08f53b..a88b427e3349a 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; + pkgConfigModules = [ "libthai" ]; }; } diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 086ca28676b3c..780ae7418dded 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; + buildInputs = [ dbus dbus-glib gtk3 gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 75649eabaede7..392786524a875 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,8 +86,8 @@ */ let - version = "23.1.3"; - hash = "sha256-L21zgbwQ+9LWJjrRAieFuLURBGwakEFi+PfaGO6ortk="; + version = "23.1.4"; + hash = "sha256-cmGhf7lIZ+PcWpDYofEA+gSwy73lHSUwLAhytemhCVk="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 2fae8135124e1..e26fe4fa00346 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,11 +7,11 @@ # Optional dependencies , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , c-aresMinimal, libev, openssl, zlib -, enableAsioLib ? false, boost , enableGetAssets ? false, libxml2 , enableHpack ? false, jansson +, enableHttp3 ? false, ngtcp2, nghttp3, quictls , enableJemalloc ? false, jemalloc -, enablePython ? false, python3Packages, ncurses +, enablePython ? false, python3, ncurses # Unit tests ; we have to set TZDIR, which is a GNUism. , enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata @@ -27,41 +27,38 @@ assert enableGetAssets -> enableApp; assert enableHpack -> enableApp; +assert enableHttp3 -> enableApp; assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.51.0"; + version = "1.54.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA="; + sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0="; }; - outputs = [ "bin" "out" "dev" "lib" ] - ++ lib.optionals (enablePython) [ "python" ]; + outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (enableApp) [ installShellFiles ] - ++ lib.optionals (enablePython) [ python3Packages.cython ]; + ++ lib.optionals (enableApp) [ installShellFiles ]; - buildInputs = lib.optionals enableApp [ c-aresMinimal libev openssl zlib ] - ++ lib.optionals (enableAsioLib) [ boost ] + buildInputs = lib.optionals enableApp [ c-aresMinimal libev zlib ] + ++ lib.optionals (enableApp && !enableHttp3) [ openssl ] ++ lib.optionals (enableGetAssets) [ libxml2 ] ++ lib.optionals (enableHpack) [ jansson ] ++ lib.optionals (enableJemalloc) [ jemalloc ] - ++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ]; + ++ lib.optionals (enableHttp3) [ ngtcp2 nghttp3 quictls ] + ++ lib.optionals (enablePython) [ python3 ]; enableParallelBuilding = true; configureFlags = [ "--disable-examples" (lib.enableFeature enableApp "app") - ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ - "--enable-python-bindings" - "--with-cython=${python3Packages.cython}/bin/cython" - ]; + (lib.enableFeature enableHttp3 "http3") + ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; @@ -70,22 +67,18 @@ stdenv.mkDerivation rec { export TZDIR=${tzdata}/share/zoneinfo ''; - preInstall = lib.optionalString (enablePython) '' - mkdir -p $out/${python3Packages.python.sitePackages} - # convince installer it's ok to install here - export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}" - ''; - postInstall = lib.optionalString (enablePython) '' - mkdir -p $python/${python3Packages.python.sitePackages} - mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages} - rm -r $out/lib - '' + lib.optionalString (enableApp) '' + postInstall = lib.optionalString (enableApp) '' installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} + '' + lib.optionalString (!enableApp) '' + rm -r $out/bin + '' + lib.optionalString (enablePython) '' + patchShebangs $out/share/nghttp2 + '' + lib.optionalString (!enablePython) '' + rm -r $out/share ''; passthru.tests = { inherit curl libsoup; - python-nghttp2 = python3Packages.nghttp2; }; meta = with lib; { diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index e85a7674a2634..9bfd3324242a9 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-FWNWpRuCUyqTIyLZkBFKrd2urjSCqHp20mBAXOcJm14="; + hash = "sha256-vY3RooC8ttezru6vAqbG1MU5uZhD8fLnlEYVYS3pFRk="; }; outputs = [ "out" "dev" "doc" ]; @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { "-DENABLE_STATIC_LIB=OFF" ]; + preConfigure = '' + # https://github.com/ngtcp2/ngtcp2/issues/858 + # Fix ngtcp2_crypto_openssl remnants. + substituteInPlace crypto/includes/CMakeLists.txt \ + --replace 'ngtcp2/ngtcp2_crypto_openssl.h' 'ngtcp2/ngtcp2_crypto_quictls.h' + ''; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index eded5f1b5b963..11121059500e8 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -96,6 +96,9 @@ stdenv.mkDerivation rec { preCheck = '' substituteInPlace tests/scripts/all \ --replace "/bin/rm" "rm" + + # skip flaky tests + rm -f tests/scripts/test063-delta-multiprovider ''; doCheck = true; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 79bc2421dc997..9fa4bf10f47fc 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ - cairo glib gobject-introspection + cairo glib gnome.gnome-common gtk3 gnome.libsoup ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 7f545958e71bb..1d089774cc67a 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,17 +1,17 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook -, docbook-xsl-nons -, gtk-doc -, installShellFiles -, libxslt # for xsltproc +, meson +, ninja , pkg-config -, which +, libtasn1 +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gettext +, mesonEmulatorHook , libffi -, libiconv , libintl -, libtasn1 }: stdenv.mkDerivation rec { @@ -25,65 +25,49 @@ stdenv.mkDerivation rec { hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; }; - outputs = [ "out" "bin" "dev"]; + outputs = [ "out" "bin" "dev" ]; + + strictDeps = true; - # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs - # provides the asn1Parser binary on the hostPlatform needed for building. - # at the same time, libtasn1 in buildInputs provides the libasn1 library - # to link against for the target platform. - # Hence, libtasn1 is required in both native and build inputs. nativeBuildInputs = [ - autoreconfHook - docbook-xsl-nons - gtk-doc - installShellFiles - libtasn1 - libxslt.bin + meson + ninja pkg-config - which + libtasn1 # asn1Parser + libxslt # xsltproc + docbook-xsl-nons + docbook_xml_dtd_43 + gettext + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ libffi - libiconv - libintl libtasn1 + libintl ]; - autoreconfPhase = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - configureFlags = [ - "--enable-doc" + mesonFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-trust-paths=${lib.concatStringsSep ":" [ - "/etc/ssl/trust-source" # p11-kit trust source - "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... - "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + (lib.mesonBool "man" true) + (lib.mesonEnable "systemd" false) + (lib.mesonOption "bashcompdir" "${placeholder "bin"}/share/bash-completion/completions") + (lib.mesonOption "trust_paths" (lib.concatStringsSep ":" [ + "/etc/ssl/trust-source" # p11-kit trust source + "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... + "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS "/var/lib/ca-certificates/ca-bundle.pem" # openSUSE - "/etc/ssl/cert.pem" # Darwin/macOS - ]}" + "/etc/ssl/cert.pem" # Darwin/macOS + ])) ]; - enableParallelBuilding = true; - - # Tests run in fakeroot for non-root users - preCheck = '' - if [ "$(id -u)" != "0" ]; then - export FAKED_MODE=1 - fi - ''; - - doCheck = !stdenv.isDarwin; - - installFlags = [ - "exampledir=${placeholder "out"}/etc/pkcs11" - ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - postInstall = '' - installShellCompletion --bash bash-completion/{p11-kit,trust} + postPatch = '' + # Install sample config files to $out/etc even though they will be loaded from /etc. + substituteInPlace p11-kit/meson.build \ + --replace 'install_dir: prefix / p11_system_config' "install_dir: '$out/etc/pkcs11'" ''; meta = with lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index a92f5f6d16505..e2155043aa3f9 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -119,5 +119,14 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.unix; + + pkgConfigModules = [ + "pango" + "pangocairo" + "pangofc" + "pangoft2" + "pangoot" + "pangoxft" + ]; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 8bc1055279fa0..52219152845ba 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -57,5 +57,9 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ]; + pkgConfigModules = [ + "libpcre" + "libpcreposix" + ]; }; } diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3f58975cf3b42..08b92288e5447 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.74"; + version = "0.3.77"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-ZV66niKeR4PDaqUuVqiosY7LSDLmIjrDsmCZyQkR72Y="; + sha256 = "sha256-dRAo/GzWvXKVCGLM12YyTQmgXHEYn3QbOyaZKmlqTYY="; }; patches = [ diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 37d83ff5b2b2a..fdccb4d093367 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, fetchpatch2 +}: stdenv.mkDerivation rec { pname = "popt"; @@ -12,6 +16,23 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # Do not require <sys/ioctl.h> + (fetchpatch2 { + url = "https://aur.archlinux.org/cgit/aur.git/plain/get-w32-console-maxcols.mingw32.patch?h=mingw-w64-popt&id=63f2cdb0de116362c49681cef20f7a8b4355e85a"; + sha256 = "zv43l1RBqNzT/JG+jQaMVFaFv+ZYPuIiAtKUDzJJBbc="; + stripLen = 1; + extraPrefix = "src/"; + }) + + # Do not try to detect setuid, it is not a thing. + (fetchpatch2 { + url = "https://github.com/rpm-software-management/popt/commit/905544c5d9767894edaf71a1e3ce5126944c5695.patch"; + sha256 = "3PmcxeiEZ/Hof0zoVFSytEXvQ8gE8Sp5UdagExPVICU="; + stripLen = 1; + extraPrefix = "src/"; + revert = true; + }) ]; doCheck = false; # fails diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index b1b78bb257048..838657f48bbef 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.4.0"; + version = "11.5.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-cG8TxgWXZGol7X2eRQNeknMo4L8PoWSMvxOsDVO/Rx4="; + hash = "sha256-lojvsCgBsT7wVRLWfkeOduEYUG7ztI/uryM0WueWiL0="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 2333b63057e2b..ec9669f3c7d92 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "1.11.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-Qqdw5dy+JUBSDpbWEh3Ap3+3h+CcNdfBL+rloRzWGEQ="; + hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 7655c4db254ce..dd68fef04e6b4 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.46"; + version = "1.3.47"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X+ZwM53ensCeUoxNa8cBO4KcWxWbb7iKxIRysImvKxw="; + sha256 = "sha256-wFn7vJA6FCfgFCjjDdyOtBv209yeJNFlG1fKMQ84Bj0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index f35ff4c5ce588..426cbd3ff4ea8 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -15,31 +15,42 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/a3AHQnPn1QlOALF7IfrEN5RzkEwQRQVrojDCUBiG4s="; }; - buildInputs = [ bzip2 curl zlib ]; + patches = [ + ./darwin-rpath-universal.patch + ]; - patches = [ ./darwin-rpath-universal.patch ]; + buildInputs = [ + bzip2 + curl + zlib + ]; - configureFlags = [ "--with-bzip2=${bzip2.out}" "--enable-reentrant" ]; + configureFlags = [ + "--with-bzip2=${bzip2.out}" + "--enable-reentrant" + ]; hardeningDisable = [ "format" ]; # Shared-only build buildFlags = [ "shared" ]; - postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in - ''; + + postPatch = '' + sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + ''; meta = { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; - longDescription = - '' CFITSIO is a library of C and Fortran subroutines for reading and - writing data files in FITS (Flexible Image Transport System) data - format. CFITSIO provides simple high-level routines for reading and - writing FITS files that insulate the programmer from the internal - complexities of the FITS format. CFITSIO also provides many - advanced features for manipulating and filtering the information in - FITS files. - ''; + longDescription = '' + CFITSIO is a library of C and Fortran subroutines for reading and + writing data files in FITS (Flexible Image Transport System) data + format. CFITSIO provides simple high-level routines for reading and + writing FITS files that insulate the programmer from the internal + complexities of the FITS format. CFITSIO also provides many + advanced features for manipulating and filtering the information in + FITS files. + ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xbreak hjones2199 ]; diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index cde327c550eb7..3c31d152fc705 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-UUWJENGn60YQdUSQ55uL+/3xt/JUsVuKnqm/ef7wPVM="; + hash = "sha256-Iy9BhkyJa2nFxwVXb4LAlgVAHnu+58Ago2eEgAIlZ7M="; }; patches = [ diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index ec2d166ef580b..a481a12932f9e 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -1,35 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gtest }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doctest +}: + stdenv.mkDerivation rec { pname = "xsimd"; - version = "9.0.1"; + version = "11.1.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = version; - sha256 = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk="; + sha256 = "sha256-l6IRzndjb95hIcFCCm8zmlNHWtKduqy2t/oml/9Xp+w="; }; + patches = [ + # Ideally, Accelerate/Accelerate.h should be used for this implementation, + # but it doesn't work... Needs a Darwin user to debug this. We apply this + # patch unconditionally, because the #if macros make sure it doesn't + # interfer with the Linux implementations. + ./fix-darwin-exp10-implementation.patch + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/xtensor-stack/xsimd/issues/807 + ./disable-test_error_gamma-test.patch + ] ++ lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ + # - Darwin report: https://github.com/xtensor-stack/xsimd/issues/917 + # - Musl report: https://github.com/xtensor-stack/xsimd/issues/798 + ./disable-exp10-test.patch + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # https://github.com/xtensor-stack/xsimd/issues/798 + ./disable-polar-test.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + # Fix suggested here: https://github.com/xtensor-stack/xsimd/issues/798#issuecomment-1356884601 + # Upstream didn't merge that from some reason. + ./fix-atan-test.patch + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + cmakeFlags = [ + "-DBUILD_TESTS=${if (doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + ]; doCheck = true; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ + doctest + ]; checkTarget = "xtest"; - GTEST_FILTER = - let - # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 - filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [ - "error_gamma_test/*" - ]; - in - "-${builtins.concatStringsSep ":" filteredTests}"; - - # https://github.com/xtensor-stack/xsimd/issues/748 - postPatch = '' - substituteInPlace xsimd.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; meta = with lib; { description = "C++ wrappers for SIMD intrinsics"; diff --git a/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/pkgs/development/libraries/xsimd/disable-exp10-test.patch new file mode 100644 index 0000000000000..62e24e18c6b76 --- /dev/null +++ b/pkgs/development/libraries/xsimd/disable-exp10-test.patch @@ -0,0 +1,34 @@ +commit 87433035c70578507e08565723c99158290f2488 +Author: Doron Behar <doron.behar@gmail.com> +Date: Tue Aug 1 13:26:04 2023 +0300 + + Darwin & Musl: Disable failing exp10 test + +diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp +index 84b4b0b..1b29742 100644 +--- a/test/test_xsimd_api.cpp ++++ b/test/test_xsimd_api.cpp +@@ -515,11 +515,6 @@ struct xsimd_api_float_types_functions + value_type val(2); + CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); + } +- void test_exp10() +- { +- value_type val(2); +- CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); +- } + void test_exp2() + { + value_type val(2); +@@ -804,11 +799,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) + Test.test_exp(); + } + +- SUBCASE("exp10") +- { +- Test.test_exp10(); +- } +- + SUBCASE("exp2") + { + Test.test_exp2(); diff --git a/pkgs/development/libraries/xsimd/disable-polar-test.patch b/pkgs/development/libraries/xsimd/disable-polar-test.patch new file mode 100644 index 0000000000000..cbb7c0313c6d0 --- /dev/null +++ b/pkgs/development/libraries/xsimd/disable-polar-test.patch @@ -0,0 +1,35 @@ +commit 9374b88b97911d9c6e19d5e764e25183cd45d534 +Author: Doron Behar <doron.behar@gmail.com> +Date: Tue Aug 1 13:29:16 2023 +0300 + + aarch64-Darwin: Disable failing polar test + +diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp +index 1b29742..03c6b4b 100644 +--- a/test/test_xsimd_api.cpp ++++ b/test/test_xsimd_api.cpp +@@ -652,12 +652,6 @@ struct xsimd_api_float_types_functions + value_type val1(4); + CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); + } +- void test_polar() +- { +- value_type val0(3); +- value_type val1(4); +- CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); +- } + void test_pow() + { + value_type val0(2); +@@ -912,11 +906,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) + Test.test_nextafter(); + } + +- SUBCASE("polar") +- { +- Test.test_polar(); +- } +- + SUBCASE("pow") + { + Test.test_pow(); diff --git a/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch b/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch new file mode 100644 index 0000000000000..a7344d231b8db --- /dev/null +++ b/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch @@ -0,0 +1,36 @@ +commit 3f751cef6b27ec13418a92c5b5f36b22bb5ffd55 +Author: Doron Behar <doron.behar@gmail.com> +Date: Tue Aug 1 13:24:34 2023 +0300 + + Darwin: Disable failing test from test_error_gamma.cpp + +diff --git a/test/test_error_gamma.cpp b/test/test_error_gamma.cpp +index 214cbb5..299e5b8 100644 +--- a/test/test_error_gamma.cpp ++++ b/test/test_error_gamma.cpp +@@ -131,25 +131,6 @@ struct error_gamma_test + INFO("lgamma"); + CHECK_EQ(diff, 0); + } +-#if !(XSIMD_WITH_AVX && !XSIMD_WITH_AVX2) +- +- // tgamma (negative input) +- { +- std::transform(gamma_neg_input.cbegin(), gamma_neg_input.cend(), expected.begin(), +- [](const value_type& v) +- { return std::lgamma(v); }); +- batch_type in, out; +- for (size_t i = 0; i < nb_input; i += size) +- { +- detail::load_batch(in, gamma_neg_input, i); +- out = lgamma(in); +- detail::store_batch(out, res, i); +- } +- size_t diff = detail::get_nb_diff(res, expected); +- INFO("lgamma (negative input)"); +- CHECK_EQ(diff, 0); +- } +-#endif + } + }; + diff --git a/pkgs/development/libraries/xsimd/fix-atan-test.patch b/pkgs/development/libraries/xsimd/fix-atan-test.patch new file mode 100644 index 0000000000000..3d1517610aae5 --- /dev/null +++ b/pkgs/development/libraries/xsimd/fix-atan-test.patch @@ -0,0 +1,19 @@ +commit f60dad2c1d8ad47fbff761ce1cb027fc7c3a40e8 +Author: Doron Behar <doron.behar@gmail.com> +Date: Tue Aug 1 13:47:37 2023 +0300 + + Musl: Fix atan test from test_complex_trigonometric.cpp + +diff --git a/test/test_complex_trigonometric.cpp b/test/test_complex_trigonometric.cpp +index a486110..691db77 100644 +--- a/test/test_complex_trigonometric.cpp ++++ b/test/test_complex_trigonometric.cpp +@@ -155,7 +155,7 @@ struct complex_trigonometric_test + out = atan(in); + detail::store_batch(out, res, i); + } +- size_t diff = detail::get_nb_diff(res, expected); ++ size_t diff = detail::get_nb_diff_near(res, expected, 1e-12); + CHECK_EQ(diff, 0); + } + diff --git a/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch b/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch new file mode 100644 index 0000000000000..caa7db0bcc134 --- /dev/null +++ b/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch @@ -0,0 +1,22 @@ +diff --git i/include/xsimd/arch/xsimd_scalar.hpp w/include/xsimd/arch/xsimd_scalar.hpp +index 9066da6..7aa3b6b 100644 +--- i/include/xsimd/arch/xsimd_scalar.hpp ++++ w/include/xsimd/arch/xsimd_scalar.hpp +@@ -502,16 +502,7 @@ namespace xsimd + return !(x0 == x1); + } + +-#if defined(__APPLE__) +- inline float exp10(const float& x) noexcept +- { +- return __exp10f(x); +- } +- inline double exp10(const double& x) noexcept +- { +- return __exp10(x); +- } +-#elif defined(__GLIBC__) ++#if defined(__GLIBC__) + inline float exp10(const float& x) noexcept + { + return ::exp10f(x); diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index d5a8df6f437e6..f7631de1bf293 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,39 +2,19 @@ , stdenv , fetchFromGitHub , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA="; + hash = "sha256-kofPs01jb189LUjYHHt+KxDifZQWl0Hm779711mvWtI="; }; - # CMake build fixes - patches = [ - # Merged in https://github.com/Cyan4973/xxHash/pull/649 - # Should be present in next release - (fetchpatch { - name = "cmake-install-fix"; - url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch"; - sha256 = "sha256-B1PZ/0BXlOrSiPvgCPLvI/sjQvnR0n5PQHOO38LOij0="; - }) - - # Submitted at https://github.com/Cyan4973/xxHash/pull/723 - (fetchpatch { - name = "cmake-pkgconfig-fix"; - url = "https://github.com/Cyan4973/xxHash/commit/5db353bbd05ee5eb1f90afc08d10da9416154e55.patch"; - sha256 = "sha256-dElgSu9DVo2hY6TTVHLTtt0zkXmQV3nc9i/KbrDkK8s="; - }) - ]; - - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index a406e28b45a92..d9d52c777b45a 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -64,6 +64,7 @@ postcss-cli = "postcss"; prettier = "prettier"; purescript-psa = "psa"; + purs-tidy = "purs-tidy"; react-native-cli = "react-native"; react-tools = "jsx"; remod-cli = "remod"; diff --git a/pkgs/development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch b/pkgs/development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch new file mode 100644 index 0000000000000..4d2bef16c9c4b --- /dev/null +++ b/pkgs/development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch @@ -0,0 +1,26 @@ +https://github.com/gfx/p5-Data-Clone/pull/3 + +From 43102a83d15aedc61e5904eb5a6dab33c3c02b40 Mon Sep 17 00:00:00 2001 +From: Yves Orton <demerphq@gmail.com> +Date: Thu, 9 Feb 2023 16:24:45 +0100 +Subject: [PATCH] t/07_stack.t - isn't is deprecated, use isnt instead + +As of 5.37.8 use of apostrophe for a package separator is deprecated, +and in 5.40 it will be removed entirely. Switch to isnt() instead +of isn't(). +--- + t/07_stack.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/07_stack.t b/t/07_stack.t +index 165e6a5..a750366 100644 +--- a/t/07_stack.t ++++ b/t/07_stack.t +@@ -17,6 +17,6 @@ use Data::Clone; + + my $before = bless [], Bar::; + my $after = clone($before); +-isn't $after, $before, 'stack reallocation during callback'; ++isnt $after, $before, 'stack reallocation during callback'; + + done_testing; \ No newline at end of file diff --git a/pkgs/development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch b/pkgs/development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch new file mode 100644 index 0000000000000..00fd4b7e0c692 --- /dev/null +++ b/pkgs/development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch @@ -0,0 +1,20 @@ +smartmatch deprecated in perl-5.37.10 + +Patch by @pghmcfc from +https://github.com/dex4er/perl-Exception-Base/issues/5#issuecomment-1637075218 + +diff --git a/t/tlib/Exception/BaseTest.pm b/t/tlib/Exception/BaseTest.pm +index d590d12..e531ed7 100644 +--- a/t/tlib/Exception/BaseTest.pm ++++ b/t/tlib/Exception/BaseTest.pm +@@ -569,8 +569,9 @@ sub test_overload { + $self->assert_matches(qr/String at /, $obj); + + # smart matching for Perl 5.10 +- if ($] >= 5.010) { ++ # Deprecation warning added in 5.37.10 ++ if ($] >= 5.010 && $] < 5.037010) { + no if $] >= 5.018, warnings => 'experimental::smartmatch'; + eval q{ + $self->assert_num_equals(1, 'String' ~~ $obj); + diff --git a/pkgs/development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch b/pkgs/development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch new file mode 100644 index 0000000000000..dbca37a75f76e --- /dev/null +++ b/pkgs/development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch @@ -0,0 +1,31 @@ +https://rt.cpan.org/Public/Bug/Display.html?id=132995 + +From 94b5fc74c3d7ed835e83bac40632962af32f5b30 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org> +Date: Mon, 13 Jul 2020 22:08:45 +0100 +Subject: [PATCH] Fix indirect method call in ExtUtils::Constant test + +It puts both "use $];" and "bootstrap $package \$VERSION;" in the +generated test module, which is going to break if we ever remove +`indirect` from the current feature bundle. + +Fix by making the method call direct instead. +--- + t/Constant.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/Constant.t b/t/Constant.t +index d6b45668da..526a32c779 100644 +--- a/t/Constant.t ++++ b/t/Constant.t +@@ -435,7 +435,7 @@ EOT + print FH ");\n"; + # Print the AUTOLOAD subroutine ExtUtils::Constant generated for us + print FH autoload ($package, $]); +- print FH "bootstrap $package \$VERSION;\n1;\n__END__\n"; ++ print FH "$package->bootstrap(\$VERSION);\n1;\n__END__\n"; + close FH or die "close $pm: $!\n"; + + ################ test.pl +-- +2.26.2 \ No newline at end of file diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix new file mode 100644 index 0000000000000..9a81321898ccd --- /dev/null +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, asgiref +, httpx +, pdm-backend +, pdm-pep517 +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "a2wsgi"; + version = "1.7.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qQb2LAJQ6wIBEguTQX3QsSsQW12zWvQxv+hu8NxburI="; + }; + + nativeBuildInputs = [ + pdm-backend + pdm-pep517 + ]; + + nativeCheckInputs = [ + asgiref + httpx + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Convert WSGI app to ASGI app or ASGI app to WSGI app"; + homepage = "https://github.com/abersheeran/a2wsgi"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 92f1fbd538282..bfe6bc06199be 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -32,25 +32,20 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.4"; + version = "3.8.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vy4akWLB5EG/gFof0WbiSdV0ygTgOzT5fikodp6Rq1w="; + hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; }; patches = [ (fetchpatch { - # https://github.com/aio-libs/aiohttp/pull/7178 - url = "https://github.com/aio-libs/aiohttp/commit/5718879cdb6a98bf48810a994b78bc02abaf3e07.patch"; - hash = "sha256-4UynkTZOzWzusQ2+MPZszhFA8I/PJNLeT/hHF/fASy8="; - }) - (fetchpatch { # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should likely be dropped post-3.8.4 + # Merged upstream, should likely be dropped post-3.8.5 url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; }) @@ -58,9 +53,6 @@ buildPythonPackage rec { postPatch = '' sed -i '/--cov/d' setup.cfg - - substituteInPlace setup.cfg \ - --replace "charset-normalizer >=2.0, < 3.0" "charset-normalizer >=2.0, < 4.0" ''; nativeBuildInputs = [ @@ -109,6 +101,10 @@ buildPythonPackage rec { "test_async_with_session" "test_session_close_awaitable" "test_close_run_until_complete_not_deprecated" + # https://github.com/aio-libs/aiohttp/issues/7130 + "test_static_file_if_none_match" + "test_static_file_if_match" + "test_static_file_if_modified_since_past_date" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index b577abf37c8d2..84020ba7ac54f 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0="; }; + # https://github.com/bamthomas/aioimaplib/issues/54 + doCheck = pythonOlder "3.11"; + nativeCheckInputs = [ asynctest docutils diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index ac00576cc297b..0304a8eff852a 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -1,8 +1,6 @@ { lib , astropy -, astropy-helpers , buildPythonPackage -, cython , fetchpatch , fetchPypi , matplotlib @@ -15,7 +13,10 @@ , pythonOlder , reproject , scikit-image +, setuptools +, setuptools-scm , shapely +, wheel }: buildPythonPackage rec { @@ -32,12 +33,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - astropy-helpers + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ astropy - cython matplotlib numpy pillow diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index fa4b7d0bffdf5..3add43b6509af 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "arrayqueues"; - version = "1.3.1"; + version = "1.4.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69"; + sha256 = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index fa78f2f5faaa2..5e5f9e22fb407 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.14.2"; # Check whether the version is compatible with pylint + version = "2.15.6"; # Check whether the version is compatible with pylint format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SIBzn57UNn/sLuDWt391M/kcCyjCocHmL5qi2cSX2iA="; + hash = "sha256-0oNNEVD8rYGkM11nGUD+XMwE7xgk7mJIaplrAXaECFg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 835f593e561f9..f121cc21466df 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.39.0"; + version = "3.40.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ixESPQqXQ7HDiYm8rJ8oZ/xaRHO4spUGMyRdov4vJr8="; + hash = "sha256-2yY1shsdlX40FJV3K7nT6HfKKI14/3zH8dOEnJeTahw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 7b32dc9b9ec69..a245c93e36187 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -11,20 +11,19 @@ , phonopy , potentials , pymatgen -, pytest , pytestCheckHook , pythonOlder -, pythonAtLeast , requests , scipy , setuptools , toolz +, wheel , xmltodict , pythonRelaxDepsHook }: buildPythonPackage rec { - version = "1.4.6"; + version = "unstable-2023-07-28"; pname = "atomman"; format = "pyproject"; @@ -33,12 +32,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; - rev = "v${version}"; - hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI="; + rev = "b8af21a9285959d38ee26173081db1b4488401bc"; + hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA="; }; nativeBuildInputs = [ setuptools + wheel pythonRelaxDepsHook ]; @@ -70,7 +70,6 @@ buildPythonPackage rec { ase phonopy pymatgen - pytest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 91b50e798c5b4..64f12ed24a1ac 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -9,7 +9,7 @@ , setuptools # runtime -, ffmpeg +, ffmpeg-headless # tests , numpy @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg-headless ]; preCheck = '' diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 9d89eae3e07b2..1d55b6c78530d 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "17.0.0"; + version = "17.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; + hash = "sha256-OFv5IImNwtWAeGX75FAZ8QzfvvZRxtv6R0WoQlJduvs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 1c14618486586..096fb22898883 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.8"; + version = "0.35.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-N0Rxa685jWAvlvCTUw3SKF+VqnkIaKyXPU58o9VOrjE="; + hash = "sha256-68t6l7/30euGo0dX5HTnGMl65j6UVF2f9fYZH6EhlzI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index ce100622b5851..b2d341b67c1e7 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , funcparserlib , nose , pillow @@ -28,6 +29,15 @@ buildPythonPackage rec { hash = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI="; }; + patches = [ + # https://github.com/blockdiag/blockdiag/pull/179 + (fetchpatch { + name = "pillow-10-compatibility.patch"; + url = "https://github.com/blockdiag/blockdiag/commit/20d780cad84e7b010066cb55f848477957870165.patch"; + hash = "sha256-t1zWFzAsLL2EUa0nD4Eui4Y5AhAZLRmp/yC9QpzzeUA="; + }) + ]; + propagatedBuildInputs = [ setuptools funcparserlib diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index a83cfc02849dd..2c24fe51debfb 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation rec { mv pip* pip mv setuptools* setuptools mv wheel* wheel - # Set up PYTHONPATH. The above folders need to be on PYTHONPATH - # $out is where we are installing to and takes precedence - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH" + # Set up PYTHONPATH: + # - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip. + # - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip. + export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH" echo "Building setuptools wheel..." pushd setuptools diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 09f0938782a57..e6ac07612c407 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,25 +10,26 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.26.79"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-9Xsng4xZ+IGNZ3ViYVrOyKZdRH6QPSjZALj9Q3HECBU="; + hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ botocore jmespath s3transfer - setuptools ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index f6d62659cdda4..1693f2258bccb 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -3,7 +3,6 @@ , fetchPypi , python-dateutil , jmespath -, docutils , urllib3 , pytestCheckHook , jsonschema @@ -11,17 +10,17 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.29.79"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.9"; # N.B: if you change this, change boto3 and awscli to a matching version + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-x97UQGK+07kolEz7CeFXjtP+0OTJjeTyM/PCBWqNSR4="; + hash = "sha256-vYSdOslfF4E4Xtgx11OgSj7IcKWdZZgXWq7dcdwrr18="; }; propagatedBuildInputs = [ python-dateutil jmespath - docutils urllib3 ]; @@ -30,8 +29,6 @@ buildPythonPackage rec { jsonschema ]; - doCheck = true; - disabledTestPaths = [ # Integration tests require networking "tests/integration" diff --git a/pkgs/development/python-modules/broadbean/default.nix b/pkgs/development/python-modules/broadbean/default.nix index aa4df0961797b..cb2dff1b06e9c 100644 --- a/pkgs/development/python-modules/broadbean/default.nix +++ b/pkgs/development/python-modules/broadbean/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , setuptools , versioningit +, wheel , numpy , matplotlib , schema @@ -20,10 +22,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8="; + hash = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8="; }; - nativeBuildInputs = [ setuptools versioningit ]; + patches = [ + # https://github.com/QCoDeS/broadbean/pull/538 + (fetchpatch { + name = "drop-wheel-from-pyproject.patch"; + url = "https://github.com/QCoDeS/broadbean/commit/31a2147e4f452fef1ca2b56b1cb0b10ac85ac867.patch"; + hash = "sha256-lBikIRhaf3ecwE7NZrYWeHkQCHQdfS9eeOcFExGIsVk="; + }) + # https://github.com/QCoDeS/broadbean/pull/638 + (fetchpatch { + name = "unpin-versioningit-dependency.patch"; + url = "https://github.com/QCoDeS/broadbean/commit/e4fd6c38d076aa3a6542dcd8fa7d2eb9d7a9b789.patch"; + hash = "sha256-mw68pWAjztWBw22MeoWVbwIwjzMOJRtv6HctN3v6A2A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + versioningit + wheel + ]; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 1eaed132fc6d3..ff79eacf99b80 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,27 +8,28 @@ , makeFontsConf , freefont_ttf , pikepdf -, pytest -, glibcLocales +, pytestCheckHook , cairo , cffi , numpy , withXcffib ? false , xcffib -, python , glib , gdk-pixbuf +, setuptools }: buildPythonPackage rec { pname = "cairocffi"; - version = "1.4.0"; + version = "1.5.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-UJM5syzNjXsAwiBMMnNs3njbU6MuahYtMSR40lYmzZo="; + hash = "sha256-Bxq3ty41MzALC/1VpSBWtP/cHtbmVneeKs7Ztwm4opU="; }; patches = [ @@ -43,36 +44,23 @@ buildPythonPackage rec { ./fix_test_scaled_font.patch ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" \ - --replace "pytest-cov" "" \ - --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" \ - --replace "--flake8 --isort" "" - ''; - - LC_ALL = "en_US.UTF-8"; - - # checkPhase require at least one 'normal' font and one 'monospace', - # otherwise glyph tests fails - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; + nativeBuildInputs = [ + setuptools + ]; propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; - # pytestCheckHook does not work - nativeCheckInputs = [ numpy pikepdf pytest glibcLocales ]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; + nativeCheckInputs = [ + numpy + pikepdf + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix index 398e07b39df8e..4b400f218739f 100644 --- a/pkgs/development/python-modules/calver/default.nix +++ b/pkgs/development/python-modules/calver/default.nix @@ -6,37 +6,43 @@ , pytestCheckHook }: -buildPythonPackage rec { - pname = "calver"; - version = "2022.06.26"; - - disabled = pythonOlder "3.5"; - - format = "setuptools"; - - src = fetchFromGitHub { - owner = "di"; - repo = "calver"; - rev = version; - hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "version=calver_version(True)" 'version="${version}"' - ''; - - nativeCheckInputs = [ - pretend - pytestCheckHook - ]; - - pythonImportsCheck = [ "calver" ]; - - meta = { - description = "Setuptools extension for CalVer package versions"; - homepage = "https://github.com/di/calver"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; +let + self = buildPythonPackage rec { + pname = "calver"; + version = "2022.06.26"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "di"; + repo = "calver"; + rev = version; + hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=calver_version(True)" 'version="${version}"' + ''; + + doCheck = false; # avoid infinite recursion with hatchling + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ "calver" ]; + + passthru.tests.calver = self.overridePythonAttrs { doCheck = true; }; + + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 836c270a4c032..1864b58d92d3a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0="; + hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 766857a66a85f..63304bc821141 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.2.5"; + version = "0.3.0"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-T5mmHUMNbdvexeSaIDZIm/3yQcDKnWdor9IK63FE0no="; + hash = "sha256-/bXpwSBFr1IM04GNEczzsnsjdFV4miUAzJkvrQjfIq4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 48b040565f79d..8a61e66066115 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { version = "18.8.0"; format = "setuptools"; - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CherryPy"; @@ -86,6 +86,20 @@ buildPythonPackage rec { "test_basic_request" "test_3_Redirect" "test_4_File_deletion" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + "testErrorHandling" + "testHookErrors" + "test_HTTP10_KeepAlive" + "test_No_Message_Body" + "test_HTTP11_Timeout" + "testGzip" + "test_malformed_header" + "test_no_content_length" + "test_post_filename_with_special_characters" + "test_post_multipart" + "test_iterator" + "test_1_Ram_Concurrency" + "test_2_File_Concurrency" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 6844cfb649a0b..6d748af8b5a2b 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.3"; + version = "8.1.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44="; + hash = "sha256-SO6EmVGRlSegRb/jv3uqipWcQjE04aW5jAXCC6daHL0="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index b88163506476b..92183fc1622c2 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -23,7 +23,7 @@ let pythonImportsCheck = [ "constantly" ]; - passthru.tests.constantly = self.overrideAttrs (_: { doInstallCheck = true; }); + passthru.tests.constantly = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { homepage = "https://github.com/twisted/constantly"; diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 86b77b994ea78..d8ee18a090d4b 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -34,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - asynctest certifi ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2ebcb9efffe2a..076e045d7272f 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -3,25 +3,25 @@ , callPackage , buildPythonPackage , fetchPypi -, rustPlatform , cargo -, rustc -, setuptools-rust -, openssl -, Security -, isPyPy , cffi +, hypothesis +, iso8601 +, isPyPy +, libiconv +, libxcrypt +, openssl , pkg-config +, pretend +, py , pytestCheckHook , pytest-subtests , pythonOlder -, pretend -, libiconv -, libxcrypt -, iso8601 -, py , pytz -, hypothesis +, rustc +, rustPlatform +, Security +, setuptoolsRustBuildHook }: let @@ -29,20 +29,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "40.0.1"; # Also update the hash in vectors.nix - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "41.0.2"; # Also update the hash in vectors.nix + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; + hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook - setuptools-rust + setuptoolsRustBuildHook cargo rustc pkg-config @@ -100,8 +100,6 @@ buildPythonPackage rec { Cryptography includes both high level recipes and low level interfaces to common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions. - Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.5+, and PyPy 5.4+. ''; homepage = "https://github.com/pyca/cryptography"; changelog = "https://cryptography.io/en/latest/changelog/#v" diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 71bd22bf738f0..554873de89e13 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,17 +1,19 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography }: +{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }: buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-hGBwa1tdDOSoVXHKM4nPiPcAu2oMYTPcn+D1ovW9oEE="; + hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI="; }; + nativeBuildInputs = [ setuptools ]; + # No tests included doCheck = false; @@ -20,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; homepage = "https://cryptography.io/en/latest/development/test-vectors/"; - # Source: https://github.com/pyca/cryptography/tree/master/vectors; + downloadPage = "https://github.com/pyca/cryptography/tree/master/vectors"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 3934185553058..5820914737cae 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8Hv+k2d6dVqFVMT9piLvAeIkes6Zs6eBB6qQcODQo8s="; + hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dashing/default.nix b/pkgs/development/python-modules/dashing/default.nix index d49fd667cdbe9..9caa56a87649a 100644 --- a/pkgs/development/python-modules/dashing/default.nix +++ b/pkgs/development/python-modules/dashing/default.nix @@ -1,21 +1,23 @@ { lib -, python3 +, buildPythonPackage , fetchPypi +, pythonOlder +, blessed }: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "dashing"; version = "0.1.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ blessed ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b0e10f29a6ed7..aaa5a5ae6b6d5 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,46 +1,53 @@ { lib , stdenv -, arrow-cpp -, bokeh , buildPythonPackage +, fetchFromGitHub + +# build-syste +, setuptools +, versioneer + +# dependencies , click , cloudpickle -, distributed -, fastparquet -, fetchFromGitHub -, fetchpatch , fsspec , importlib-metadata -, jinja2 -, numpy , packaging -, pandas , partd +, pyyaml +, toolz + +# optional-dependencies +, numpy , pyarrow +, lz4 +, pandas +, distributed +, bokeh +, jinja2 + +# tests +, arrow-cpp +, hypothesis +, pytest-asyncio , pytest-rerunfailures , pytest-xdist , pytestCheckHook , pythonOlder -, pyyaml -, scipy -, setuptools -, toolz -, versioneer -, zarr }: buildPythonPackage rec { pname = "dask"; - version = "2023.4.1"; - format = "setuptools"; + version = "2023.7.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask"; - repo = pname; + repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-PkEFXF6OFZU+EMFBUopv84WniQghr5Q6757Qx6D5MyE="; + hash = "sha256-1KnvIMEWT1MwlvkdgH10xk+lGSsGWJMLBonTtWwKjog="; }; nativeBuildInputs = [ @@ -59,13 +66,18 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + passthru.optional-dependencies = lib.fix (self: { array = [ numpy ]; complete = [ - distributed - ]; + pyarrow + lz4 + ] + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; dataframe = [ numpy pandas @@ -77,16 +89,16 @@ buildPythonPackage rec { bokeh jinja2 ]; - }; + }); nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures pytest-xdist - scipy - zarr + # from panda[test] + hypothesis + pytest-asyncio ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 - fastparquet pyarrow ]; @@ -103,7 +115,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace " --durations=10" "" \ --replace " --cov-config=pyproject.toml" "" \ - --replace " -v" "" + --replace "\"-v" "\" " ''; pytestFlagsArray = [ @@ -120,12 +132,10 @@ buildPythonPackage rec { # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] ++ [ - "test_chunksize_files" - # TypeError: 'ArrowStringArray' with dtype string does not support reduction 'min' - "test_set_index_string" - # numpy 1.24 - # RuntimeWarning: invalid value encountered in cast - "test_setitem_extended_API_2d_mask" + # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? + "test_dot" + "test_dot_nan" + "test_merge_column_with_nulls" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 79f8d3d5cbb92..ec386f8e0b296 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = "python-${pname}"; - rev = "v${version}"; - hash = "sha256-x9dL/FE94OixMAmjnmfzZUcYJBqE5P2AAIFsNJF0Fxo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ogogXZnuSFkWktCin+cyefjqIbGFRBVIeOrZJAa3hOE="; }; nativeBuildInputs = [ @@ -47,10 +47,15 @@ buildPythonPackage rec { disabledTests = [ # Test for Windows32 "test_print_subprocess" - # sensitive to timing + # Sensitive to timing "test_multiple_not_verbose" - # sensitive to interpreter output - "test_simple_vars" + # Sensitive to interpreter output + "test_simple" + ]; + + disabledTestPaths = [ + # pytester_pretty is not available in Nixpkgs + "tests/test_insert_assert.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 2abee722b97ed..a2219ae22cc5c 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "3.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-wkbFUrvKhdp2Hd4QkXAvhMiaqSXFD/fgIw03nLPaO5I="; + hash = "sha256-+ladx0b/bvvUW8zLjtG8IiWWdfPTqqm/KYbEK9uiFaU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 950cf9ef812ce..ccb1ffd3c1a7e 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub + +# build-system +, hatchling + +# non-propagates , django + +# tests , pytest-django , pytestCheckHook }: buildPythonPackage rec { pname = "django-bootstrap3"; - version = "23.1"; + version = "23.4"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cJW3xmqJ87rreOoCh5nr15XSlzn8hgJGBCLnwqGUrTA="; + src = fetchFromGitHub { + owner = "zostera"; + repo = "django-bootstrap3"; + rev = "refs/tags/v${version}"; + hash = "sha256-1/JQ17GjBHH0JbY4EnHOS2B3KhEJdG2yL6O2nc1HNNc="; }; + postPatch = '' + sed -i '/beautifulsoup4/d' pyproject.toml + ''; + nativeBuildInputs = [ - setuptools + hatchling ]; buildInputs = [ @@ -39,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 3 integration for Django"; homepage = "https://github.com/zostera/django-bootstrap3"; - changelog = "https://github.com/zostera/django-bootstrap3/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/zostera/django-bootstrap3/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 480c7891539fa..568ce0df30489 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -3,30 +3,32 @@ , fetchFromGitHub # build-system -, setuptools +, hatchling + +# non-propagates +, django # dependencies , beautifulsoup4 # tests -, django , python }: buildPythonPackage rec { pname = "django-bootstrap4"; - version = "23.1"; + version = "23.2"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; - rev = "v${version}"; - hash = "sha256-55pfUPwxDzpDn4stMEPvrQAexs+goN5SKFvwSR3J4aM="; + rev = "refs/tags/v${version}"; + hash = "sha256-RYGwi+hRfTqPAikrv33w27v1/WLwRvXexSusJKdr2o8="; }; nativeBuildInputs = [ - setuptools + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix index f921077934fdd..f579a31dc3e7c 100644 --- a/pkgs/development/python-modules/django-js-asset/default.nix +++ b/pkgs/development/python-modules/django-js-asset/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , django , python }: buildPythonPackage rec { pname = "django-js-asset"; - version = "2.0"; - format = "setuptools"; + version = "2.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YDOmbqB0xDBAlOSO1UBYJ8VfRjJ8Z6Hw1i24DNSrnjw="; + hash = "sha256-rxJ9TgVBiJByiFSLTg/dtAR31Fs14D4sh2axyBcKGTU="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 5a2a8e5786d66..ce03a1330f5f5 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -47,10 +47,12 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; + # xdist is disabled right now because it can cause race conditions on high core machines + # https://github.com/jazzband/django-oauth-toolkit/issues/1300 nativeCheckInputs = [ djangorestframework pytest-django - pytest-xdist + # pytest-xdist pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 01e3dd2cb55e3..402272fb54b85 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -9,29 +9,29 @@ , h2 , httpx , idna +, poetry-core , pytestCheckHook , pythonOlder , requests , requests-toolbelt -, setuptools-scm , sniffio , trio }: buildPythonPackage rec { pname = "dnspython"; - version = "2.3.0"; - format = "setuptools"; + version = "2.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik4ysD60a+cOEu9tZOC+Ejpk5iGrTAgi/21FDVKlQLk="; + hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg="; }; nativeBuildInputs = [ - setuptools-scm + poetry-core ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index e9c3a752b0dc8..aeb90488dfd1d 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-wwR7ZdbWFNRgxQubdgriDke5W6u7VNsNZV9xqQypSrY="; + hash = "sha256-O47676BOuCx3wMpeuRATQOAWZQev+R+OxZi4boQABmc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index 5944a77608417..1e890aba3309c 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , jsonschema @@ -54,6 +55,14 @@ buildPythonPackage rec { changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}"; license = with licenses; [ bsd2 /* or */ gpl2Only ]; maintainers = with maintainers; [ sorki ]; + + broken = ( + # Library not loaded: @rpath/libfdt.1.dylib + stdenv.isDarwin || + + # see https://github.com/devicetree-org/dt-schema/issues/108 + versionAtLeast jsonschema.version "4.18" + ); }; } diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3cb159e65e232..1c29e3f7d192f 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -5,7 +5,6 @@ , dvc-objects , fetchFromGitHub , funcy -, nanotime , pygtrie , pythonOlder , setuptools-scm @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.11.0"; + version = "2.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Nqxaw5gGlKZCwTquNY/6z4b8l762mnrhHyvrteVzdHE="; + hash = "sha256-BmI2D1nMeqcV0jPMJ6jzHO38AscfzDMgwh91ekKlXEs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,7 +37,6 @@ buildPythonPackage rec { diskcache dvc-objects funcy - nanotime pygtrie shortuuid sqltrie diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index 5be66325f5a67..95de44f10a263 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.11.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bjwIle7O/qwwhhK+wa2/36EO/F1kjsORJjGyASypwVE="; + hash = "sha256-Y2SMcz7aaYH1k4ieLwEijBkf6AMbCltsXBocafIVMcM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 1cfa62ea6d47b..c80c667093638 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -1,14 +1,59 @@ { lib -, python3 +, buildPythonPackage , fetchFromGitHub , fetchpatch +, pythonOlder +, pythonRelaxDepsHook +, setuptools-scm +, appdirs +, colorama +, configobj +, distro +, dpath +, dvc-azure +, dvc-data +, dvc-gs +, dvc-http +, dvc-render +, dvc-s3 +, dvc-ssh +, dvc-studio-client +, dvc-task +, flatten-dict +, flufl_lock +, funcy +, grandalf +, hydra-core +, importlib-metadata +, importlib-resources +, iterative-telemetry +, networkx +, packaging +, pathspec +, platformdirs +, psutil +, pydot +, pygtrie +, pyparsing +, requests +, rich +, ruamel-yaml +, scmrepo +, shortuuid +, shtab +, tabulate +, tomlkit +, tqdm +, typing-extensions +, voluptuous +, zc_lockfile , enableGoogle ? false , enableAWS ? false , enableAzure ? false , enableSSH ? false }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "dvc"; version = "3.8.1"; format = "pyproject"; @@ -31,12 +76,12 @@ python3.pkgs.buildPythonApplication rec { --subst-var-by dvc "$out/bin/dcv" ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ appdirs colorama configobj @@ -73,20 +118,24 @@ python3.pkgs.buildPythonApplication rec { typing-extensions voluptuous zc_lockfile - ] ++ lib.optionals enableGoogle [ - dvc-gs - ] ++ lib.optionals enableAWS [ - dvc-s3 - ] ++ lib.optionals enableAzure [ - dvc-azure - ] ++ lib.optionals enableSSH [ - dvc-ssh - ] ++ lib.optionals (pythonOlder "3.8") [ + ] + ++ lib.optionals enableGoogle passthru.optional-dependencies.gs + ++ lib.optionals enableAWS passthru.optional-dependencies.s3 + ++ lib.optionals enableAzure passthru.optional-dependencies.azure + ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + passthru.optional-dependencies = { + azure = [ dvc-azure ]; + gs = [ dvc-gs ]; + s3 = [ dvc-s3 ]; + ssh = [ dvc-ssh ]; + }; + # Tests require access to real cloud services doCheck = false; diff --git a/pkgs/applications/version-management/dvc/dvc-daemon.patch b/pkgs/development/python-modules/dvc/dvc-daemon.patch index 65ba630f3b80d..65ba630f3b80d 100644 --- a/pkgs/applications/version-management/dvc/dvc-daemon.patch +++ b/pkgs/development/python-modules/dvc/dvc-daemon.patch diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index e20cb4c4f6360..24abaebf7bb57 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -7,16 +7,16 @@ , numpy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "stack-of-tasks"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xaeMsn3G4x5DS6gXc6mbZvi96K1Yu8CuzjcGnYJYrvs="; + hash = "sha256-mUwckBelFVRCXp3hspB8WRFFaLVyRsfp6XbqU8HeHvw="; }; strictDeps = true; @@ -34,12 +34,17 @@ stdenv.mkDerivation rec { numpy ]; + doCheck = true; + pythonImportsCheck = [ + "eigenpy" + ]; + meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 2f358ba983254..35c702ea06d87 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -5,9 +5,10 @@ , pythonOlder , dnspython , greenlet +, isPyPy , monotonic , six -, nose +, nose3 , iana-etc , pytestCheckHook , libredirect @@ -35,10 +36,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose + nose3 ]; - doCheck = !stdenv.isDarwin; + # libredirect is not available on darwin + # tests hang on pypy indefinitely + doCheck = !stdenv.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0e4d38c290c12..2269445282bdf 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -7,20 +7,29 @@ , flask-sqlalchemy , mongoengine , pytestCheckHook +, pythonOlder , sqlalchemy +, sqlalchemy-utils }: buildPythonPackage rec { pname = "factory-boy"; - version = "3.2.1"; + version = "3.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; + hash = "sha256-vHbZfRplu9mEKm1yKIIJjrVJ7I7hCB+fsuj/KfDDAPE="; }; + postPatch = '' + substituteInPlace tests/test_version.py \ + --replace '"3.2.1.dev0")' '"${version}")' + ''; + propagatedBuildInputs = [ faker ]; @@ -32,6 +41,7 @@ buildPythonPackage rec { mongoengine pytestCheckHook sqlalchemy + sqlalchemy-utils ]; # Checks for MongoDB requires an a running DB @@ -51,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to create factories for complex objects"; homepage = "https://github.com/rbarrois/factory_boy"; + changelog = "https://github.com/FactoryBoy/factory_boy/blob/${version}/docs/changelog.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 62a65cfbdf63c..3215a90108821 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.0"; + version = "3.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/AOuQyiMAT0uqDyFlwAbESnbNRqtnFf+JAkyeRa45xg="; + hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index ff246c4a0e989..2570b1a274b64 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -1,53 +1,47 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, pythonAtLeast , pbr +, setuptools , testtools , mock -, python -, six +, pytestCheckHook }: buildPythonPackage rec { pname = "fixtures"; - version = "3.0.0"; + version = "4.1.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"; + hash = "sha256-grHF5p9hVSbvbAZxiKHmxgZ99/iDMlCcmfi4/buXdvM="; }; - patches = lib.optionals (pythonAtLeast "3.9") [ - # drop tests that try to monkeypatch a classmethod, which fails on python3.9 - # https://github.com/testing-cabal/fixtures/issues/44 - (fetchpatch { - url = "https://salsa.debian.org/openstack-team/python/python-fixtures/-/raw/debian/victoria/debian/patches/remove-broken-monkey-patch-test.patch"; - sha256 = "1s3hg2zmqc4shmnf90kscphzj5qlqpxghzw2a59p8f88zrbsj97r"; - }) - ]; - nativeBuildInputs = [ pbr + setuptools ]; propagatedBuildInputs = [ - testtools - six # not in install_requires, but used in fixture.py + pbr ]; + passthru.optional-dependencies = { + streams = [ + testtools + ]; + }; + nativeCheckInputs = [ mock - ]; - - checkPhase = '' - ${python.interpreter} -m testtools.run fixtures.test_suite - ''; + pytestCheckHook + ] ++ passthru.optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; - homepage = "https://pypi.python.org/pypi/fixtures"; + homepage = "https://pypi.org/project/fixtures/"; + changelog = "https://github.com/testing-cabal/fixtures/blob/${version}/NEWS"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index f30598797a75e..b32fc7b25afc2 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,38 +1,36 @@ { lib +, asgiref , buildPythonPackage , fetchFromGitHub - , flask +, hiro , limits , ordered-set -, rich -, typing-extensions - -, asgiref -, hiro , pymemcache +, pymongo , pytest-mock , pytestCheckHook +, pythonOlder , redis -, pymongo +, rich +, typing-extensions }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.1.0"; + version = "3.3.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI="; + hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ="; }; postPatch = '' - substituteInPlace requirements/main.txt \ - --replace "rich>=12,<13" "rich" - sed -i "/--cov/d" pytest.ini # flask-restful is unmaintained and breaks regularly, don't depend on it @@ -82,11 +80,14 @@ buildPythonPackage rec { "tests/test_storage.py" ]; - pythonImportsCheck = [ "flask_limiter" ]; + pythonImportsCheck = [ + "flask_limiter" + ]; meta = with lib; { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; + changelog = "https://github.com/alisaifee/flask-limiter/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index fae29247deab0..ed55629dca035 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -1,7 +1,13 @@ { lib -, python3 , buildPythonPackage , fetchPypi + +# build-system +, poetry-core + +# propagates +, typing-extensions +, repath }: buildPythonPackage rec { @@ -15,13 +21,13 @@ buildPythonPackage rec { hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ - typing-extensions + propagatedBuildInputs = [ repath + typing-extensions ]; doCheck = false; diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 95382a88c95c4..4c41e5972600f 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -1,7 +1,20 @@ { lib -, python3 , buildPythonPackage , fetchPypi + +# build-system +, poetry-core + +# propagates +, flet-core +, httpx +, oauthlib +, packaging +, typing-extensions +, watchdog +, websocket-client +, websockets + }: buildPythonPackage rec { @@ -20,11 +33,11 @@ buildPythonPackage rec { --replace 'watchdog = "^2' 'watchdog = ">=2' ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ flet-core typing-extensions websocket-client diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 43d8d8e90efc5..a1be6821b2f78 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc="; + hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/pypa/flit/blob/${version}/doc/history.rst"; description = "A simple packaging tool for simple packages"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index ec57bfd114df0..52428bc3c4eba 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 ]; diff --git a/pkgs/development/python-modules/glad2/default.nix b/pkgs/development/python-modules/glad2/default.nix index 47728d793b056..57ee88c4997a2 100644 --- a/pkgs/development/python-modules/glad2/default.nix +++ b/pkgs/development/python-modules/glad2/default.nix @@ -1,9 +1,10 @@ { lib -, python3 +, buildPythonPackage , fetchPypi +, jinja2 }: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "glad2"; version = "2.0.4"; format = "setuptools"; @@ -13,15 +14,18 @@ python3.pkgs.buildPythonPackage rec { hash = "sha256-7eFjn2nyugjx9JikCnB/NKYJ0k6y6g1sk2RomnmM99A="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ jinja2 ]; + # no python tests + doCheck = false; + pythonImportsCheck = [ "glad" ]; meta = with lib; { description = "Multi-Language GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specifications"; - homepage = "https://pypi.org/project/glad2"; + homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 68dc792aecfb7..0e85af5045b2f 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.1.2"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VQwDK9FRbHy/AFbdZKmvl5e52smSCyWTrs00DvJqVmo="; + hash = "sha256-33Z6W2dAsj5VXt3E7XJtUFiq7yFlCixnFnhbAUv+xgU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 9814e11ff7e54..efa4fba8513a6 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.4"; + version = "1.22.5"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-4TAtzA8kUbZDgNzA3TuCc1eV6JUdyBLZONi6kfOIFj4="; + hash = "sha256-vwUjJBXPYBgUKuUd07iXu3NDJoe1zheGv0btximM5bA="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 532481fbeeba8..0d00eaa22dd2f 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper gobject-introspection ]; buildInputs = [ - glibcLocales gobject-introspection gtk3 libsoup libsecret + glibcLocales gtk3 libsoup libsecret ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 8c543bce8571b..c334a58ad567b 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, packaging , pythonOlder , eventlet , gevent @@ -11,24 +11,17 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "20.1.0"; + version = "21.2.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "benoitc"; repo = "gunicorn"; rev = version; - hash = "sha256-xdNHm8NQWlAlflxof4cz37EoM74xbWrNaf6jlwwzHv4="; + hash = "sha256-xP7NNKtz3KNrhcAc00ovLZRx2h6ZqHbwiFOpCiuwf98="; }; - patches = [ - (fetchpatch { - # fix eventlet 0.30.3+ compability - url = "https://github.com/benoitc/gunicorn/commit/6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8.patch"; - hash = "sha256-+iApgohzPZ/cHTGBNb7XkqLaHOVVPF26BnPUsvISoZw="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=gunicorn --cov-report=xml" "" @@ -36,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools + packaging ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 35187aff512d3..8a886112fed99 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -5,11 +5,11 @@ # runtime , editables -, importlib-metadata # < 3.8 , packaging , pathspec , pluggy , tomli +, trove-classifiers # tests , build @@ -18,27 +18,24 @@ , virtualenv }: -let +buildPythonPackage rec { pname = "hatchling"; - version = "1.13.0"; -in -buildPythonPackage { - inherit pname version; + version = "1.18.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+NJ1osxyBzUoa3wuK8NdoFdh5tNpXC+kFlUDlfEMU8c="; + hash = "sha256-UOmcMRDOCvw/e9ut/xxxwXdY5HZzHCdgeUDPpmhkico="; }; - # listed in backend/src/hatchling/ouroboros.py + # listed in backend/pyproject.toml propagatedBuildInputs = [ editables packaging pathspec pluggy - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + trove-classifiers ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; @@ -54,7 +51,6 @@ buildPythonPackage { # listed in /backend/tests/downstream/requirements.txt nativeCheckInputs = [ build - packaging requests virtualenv ]; diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index 0964bbf89ca4c..aeec391e1cb3d 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , jsonschema , pytestCheckHook , python-dateutil @@ -12,6 +13,9 @@ buildPythonPackage rec { version = "0.0.16"; format = "pyproject"; + # ValueError: mutable default <class 'tests.conftest.Point'> for field a is not allowed: use default_factory + disabled = pythonAtLeast "3.11"; + src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix new file mode 100644 index 0000000000000..42bc3aa18ad6c --- /dev/null +++ b/pkgs/development/python-modules/html5tagger/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "html5tagger"; + version = "1.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "html5tagger"; + rev = "v${version}"; + hash = "sha256-Or0EizZC9FMjTcbgecDvgGB09KNGyxHreSDojgB7ysg="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "html5tagger" + ]; + + meta = with lib; { + description = "Create HTML documents from Python"; + homepage = "https://github.com/sanic-org/html5tagger"; + license = licenses.unlicense; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 863a56317055e..9f3905f55182f 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -13,11 +13,14 @@ , pythonOlder , sniffio , socksio +# for passthru.tests +, httpx +, httpx-socks }: buildPythonPackage rec { pname = "httpcore"; - version = "0.16.3"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +29,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng="; + hash = "sha256-qAoORhzBbjXxgtzTqbAxWBxrohzfwDWm5mxxrgeXt48="; }; propagatedBuildInputs = [ @@ -70,7 +73,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit httpx httpx-socks; + }; + meta = with lib; { + changelog = "https://github.com/encode/httpcore/releases/tag/${version}"; description = "A minimal low-level HTTP client"; homepage = "https://github.com/encode/httpcore"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index ffbea1b67c8eb..11204ec8b9b47 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.23.3"; + version = "0.24.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZLRzkyoFbAY2Xs1ORWBqvc2gpKovg9wRs/RtAryOcVg="; + hash = "sha256-qG6fgijNgQKjpSG6sg0+0yqeAU6qV7czR8NgWe63LIg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 4901467262f38..b22d82d7f22fe 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -1,13 +1,14 @@ { lib -, absl-py , blas , buildPythonPackage -, etils +, setuptools +, importlib-metadata , fetchFromGitHub , jaxlib , jaxlib-bin , lapack , matplotlib +, ml-dtypes , numpy , opt-einsum , pytestCheckHook @@ -15,7 +16,6 @@ , pythonOlder , scipy , stdenv -, typing-extensions }: let @@ -27,30 +27,32 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.5"; - format = "setuptools"; + version = "0.4.14"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "google"; repo = pname; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-UJzX8zP3qaEUIV5hPJhiGiLJO7k8p962MHWxIHDY1ZA="; + hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; }; + nativeBuildInputs = [ + setuptools + ]; + # jaxlib is _not_ included in propagatedBuildInputs because there are # different versions of jaxlib depending on the desired target hardware. The # JAX project ships separate wheels for CPU, GPU, and TPU. propagatedBuildInputs = [ - absl-py - etils + ml-dtypes numpy opt-einsum scipy - typing-extensions - ] ++ etils.optional-dependencies.epath; + ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; nativeCheckInputs = [ jaxlib' @@ -96,24 +98,12 @@ buildPythonPackage rec { "testScanGrad_jit_scan" ]; - # See https://github.com/google/jax/issues/11722. This is a temporary fix in - # order to unblock etils, and upgrading jax/jaxlib to the latest version. See - # https://github.com/NixOS/nixpkgs/issues/183173#issuecomment-1204074993. - disabledTestPaths = [ - "tests/api_test.py" - "tests/core_test.py" - "tests/lax_numpy_indexing_test.py" - "tests/lax_numpy_test.py" - "tests/nn_test.py" - "tests/random_test.py" - "tests/sparse_test.py" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # RuntimeWarning: invalid value encountered in cast "tests/lax_test.py" ]; - # As of 0.3.22, `import jax` does not work without jaxlib being installed. - pythonImportsCheck = [ ]; + pythonImportsCheck = [ "jax" ]; meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index b3d3138ab4431..c0773878c1d8e 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,11 +18,12 @@ , autoPatchelfHook , buildPythonPackage , config -, cudnn ? cudaPackages.cudnn +, fetchPypi , fetchurl , flatbuffers -, isPy39 +, jaxlib-build , lib +, ml-dtypes , python , scipy , stdenv @@ -35,46 +36,57 @@ let inherit (cudaPackages) cudatoolkit cudnn; in -assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1"; -assert cudaSupport -> lib.versionAtLeast cudnn.version "8.2"; +assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.4"; + version = "0.4.14"; + + inherit (python) pythonVersion; + + # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the + # official instructions recommend installing CPU-only versions via PyPI. + cpuSrcs = + let + getSrcFromPypi = { platform, hash }: fetchPypi { + inherit version platform hash; + pname = "jaxlib"; + format = "wheel"; + # See the `disabled` attr comment below. + dist = "cp310"; + python = "cp310"; + abi = "cp310"; + }; + in + { + "x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + hash = "sha256-nyylSZfqHeftlvVgJZFCN1ldjluZVJIYu4ZSsVxvXf8="; + }; + "aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + hash = "sha256-La3wYbGCjWTl7krBD6BaBRqyBD8R530Lckbz0AWv0FM="; + }; + "x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + hash = "sha256-hDg5+qisgtgOrdvbjxsUgI73cW6Aah8NLjhPe4kMAsM="; + }; + }; - pythonVersion = python.pythonVersion; # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. # When upgrading, you can get these hashes from prefetch.sh. See - # https://github.com/google/jax/issues/12879 as to why this specific URL is - # the correct index. - cpuSrcs = { - "x86_64-linux" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-4VT909AB+ti5HzQvsaZWNY6MS/GItlVEFH9qeZnUuKQ="; - }; - "aarch64-darwin" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-wuOmoCeTldslSa0MommQeTe+RYKhUMam1ZXrgSov+8U="; - }; - "x86_64-darwin" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl"; - hash = "sha256-arfiTw8yafJwjRwJhKby2O7y3+4ksh3PjaKW9JgJ1ok="; - }; - }; - + # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. gpuSrc = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-bJ62DdzuPSV311ZI2R/LJQ3fOkDibtz2+8wDKw31FLk="; + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-CcQ5kjp4XfUX4/RwFY3T5G3kVKAeyoCTXu1Lo4O16Qo="; }; + in -buildPythonPackage rec { +buildPythonPackage { pname = "jaxlib"; inherit version; format = "wheel"; - # At the time of writing (2022-10-19), there are releases for <=3.10. - # Supporting all of them is a pain, so we focus on 3.10, the current nixpkgs - # python version. disabled = !(pythonVersion == "3.10"); # See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6. @@ -87,9 +99,10 @@ buildPythonPackage rec { # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. - nativeBuildInputs = lib.optionals cudaSupport [ autoPatchelfHook addOpenGLRunpath ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ] + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; # Dynamic link dependencies - buildInputs = [ stdenv.cc.cc ]; + buildInputs = [ stdenv.cc.cc.lib ]; # jaxlib contains shared libraries that open other shared libraries via dlopen # and these implicit dependencies are not recognized by ldd or @@ -113,7 +126,12 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + propagatedBuildInputs = [ + absl-py + flatbuffers + ml-dtypes + scipy + ]; # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for @@ -123,7 +141,7 @@ buildPythonPackage rec { ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas ''; - pythonImportsCheck = [ "jaxlib" ]; + inherit (jaxlib-build) pythonImportsCheck; meta = with lib; { description = "XLA library for JAX"; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index bf93bf1a5a26e..070516deefd98 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -4,7 +4,7 @@ # Build-time dependencies: , addOpenGLRunpath -, bazel_5 +, bazel_6 , binutils , buildBazelPackage , buildPythonPackage @@ -21,11 +21,13 @@ , setuptools , symlinkJoin , wheel +, build , which # Python dependencies: , absl-py , flatbuffers +, ml-dtypes , numpy , scipy , six @@ -35,7 +37,6 @@ , giflib , grpc , libjpeg_turbo -, protobuf , python , snappy , zlib @@ -53,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.4"; + version = "0.4.14"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -99,7 +100,9 @@ let # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" "com_github_grpc_grpc" - "com_google_protobuf" + # ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain': + # target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel + # "com_google_protobuf" # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)' # "com_googlesource_code_re2" "curl" @@ -120,7 +123,9 @@ let "org_sqlite" "pasta" "png" - "pybind11" + # ERROR: /build/output/external/pybind11/BUILD.bazel: no such target '@pybind11//:osx': + # target 'osx' not declared in package '' defined by /build/output/external/pybind11/BUILD.bazel + # "pybind11" "six_archive" "snappy" "tblib_archive" @@ -138,14 +143,15 @@ let bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; - bazel = bazel_5; + # See https://github.com/google/jax/blob/main/.bazelversion for the latest. + bazel = bazel_6; src = fetchFromGitHub { owner = "google"; repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-DP68UwS9bg243iWU4MLHN0pwl8LaOcW3Sle1ZjsLOHo="; + hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; }; nativeBuildInputs = [ @@ -154,6 +160,7 @@ let git setuptools wheel + build which ] ++ lib.optionals stdenv.isDarwin [ cctools @@ -169,7 +176,7 @@ let numpy openssl pkgs.flatbuffers - protobuf + pkgs.protobuf pybind11 scipy six @@ -188,7 +195,8 @@ let rm -f .bazelversion ''; - bazelTargets = [ "//build:build_wheel" ]; + bazelRunTarget = "//jaxlib/tools:build_wheel"; + runTargetFlags = [ "--output_path=$out" "--cpu=${arch}" ]; removeRulesCC = false; @@ -207,7 +215,11 @@ let build --action_env=PYENV_ROOT build --python_path="${python}/bin/python" build --distinct_host_configuration=false - build --define PROTOBUF_INCLUDE_PATH="${protobuf}/include" + build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" + '' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) '' + build --config=avx_posix + '' + lib.optionalString mklSupport '' + build --config=mkl_open_source_only '' + lib.optionalString cudaSupport '' build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}" build --action_env CUDNN_INSTALL_PATH="${cudnn}" @@ -234,7 +246,7 @@ let fetchAttrs = { TF_SYSTEM_LIBS = lib.concatStringsSep "," tf_system_libs; # we have to force @mkl_dnn_v1 since it's not needed on darwin - bazelTargets = bazelTargets ++ [ "@mkl_dnn_v1//:mkl_dnn" ]; + bazelTargets = [ bazelRunTarget "@mkl_dnn_v1//:mkl_dnn" ]; bazelFlags = bazelFlags ++ [ "--config=avx_posix" ] ++ lib.optionals cudaSupport [ @@ -247,11 +259,12 @@ let "--config=mkl_open_source_only" ]; - sha256 = - if cudaSupport then - "sha256-O6bM7Lc8eaFyO4Xzl5/hvBrbPioI+Yeqx9yNC97fvKk=" - else - "sha256-gLMJfJSQIdGGY2Ivx4IgDWg0hc+mxzlqY11CUkSWcjI="; + sha256 = (if cudaSupport then { + x86_64-linux = "sha256-8QaXoZq6oITRsYn4RdLUXcKQv3PJ4Q3ItX9PkBwxGBI="; + } else { + x86_64-linux = "sha256-M/h5EZmyiV4QvzgKRjdz7V1LHENUJlc/ig1QAItnWVQ="; + aarch64-linux = "sha256-edkYcdlvOLNGRSanch1fGCZwq8SFn3TzcUNt1LhzG/E="; + }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; buildAttrs = { @@ -261,25 +274,13 @@ let "nsync" # fails to build on darwin ]); - bazelFlags = bazelFlags ++ lib.optionals (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [ - "--config=avx_posix" - ] ++ lib.optionals cudaSupport [ - "--config=cuda" - ] ++ lib.optionals mklSupport [ - "--config=mkl_open_source_only" - ]; # Note: we cannot do most of this patching at `patch` phase as the deps are not available yet. - # 1) Fix pybind11 include paths. - # 2) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on + # 1) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on # loading multiple extensions in the same python program due to duplicate protobuf DBs. - # 3) Patch python path in the compiler driver. - preBuild = '' - for src in ./jaxlib/*.{cc,h} ./jaxlib/cuda/*.{cc,h}; do - sed -i 's@include/pybind11@pybind11@g' $src - done - '' + lib.optionalString cudaSupport '' + # 2) Patch python path in the compiler driver. + preBuild = lib.optionalString cudaSupport '' export NIX_LDFLAGS+=" -L${backendStdenv.nixpkgsCompatibleLibstdcxx}/lib" - patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl + patchShebangs ../output/external/xla/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl '' + lib.optionalString stdenv.isDarwin '' # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 @@ -289,16 +290,12 @@ let substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ --replace "/usr/bin/libtool" "${cctools}/bin/libtool" '' + (if stdenv.cc.isGNU then '' - sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); - - installPhase = '' - ./bazel-bin/build/build_wheel --output_path=$out --cpu=${arch} - ''; }; inherit meta; @@ -345,13 +342,19 @@ buildPythonPackage { grpc jsoncpp libjpeg_turbo + ml-dtypes numpy scipy six snappy ]; - pythonImportsCheck = [ "jaxlib" ]; + pythonImportsCheck = [ + "jaxlib" + # `import jaxlib` loads surprisingly little. These imports are actually bugs that appeared in the 0.4.11 upgrade. + "jaxlib.cpu_feature_guard" + "jaxlib.xla_client" + ]; # Without it there are complaints about libcudart.so.11.0 not being found # because RPATH path entries added above are stripped. diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh index 31db6530639fc..3362e2d0b7813 100755 --- a/pkgs/development/python-modules/jaxlib/prefetch.sh +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -1,7 +1,15 @@ -version="$1" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)" -nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)" +#!/usr/bin/env bash + +prefetch () { + expr="(import <nixpkgs> { system = \"$1\"; config.cudaSupport = $2; }).python3.pkgs.jaxlib-bin.src.url" + url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) + echo "$url" + sha256=$(nix-prefetch-url "$url") + nix hash to-sri --type sha256 "$sha256" + echo +} + +prefetch "x86_64-linux" "false" +prefetch "aarch64-darwin" "false" +prefetch "x86_64-darwin" "false" +prefetch "x86_64-linux" "true" diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 7317ee8fc1446..84e693bb72235 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,32 +1,53 @@ { lib -, pythonAtLeast -, pythonOlder , buildPythonPackage +, pythonOlder , fetchPypi , stdenv -, numpydoc -, pytestCheckHook -, lz4 + +# build-system , setuptools -, sphinx + +# propagates (optional, but unspecified) +# https://github.com/joblib/joblib#dependencies +, lz4 , psutil + +# tests +, pytestCheckHook +, threadpoolctl }: buildPythonPackage rec { pname = "joblib"; - version = "1.2.0"; + version = "1.3.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; + hash = "sha256-H5N5Bt9lMpupgBPclpL+IqTF5KZIES3lAFCLGKIbQeM="; }; - nativeCheckInputs = [ sphinx numpydoc pytestCheckHook psutil ]; - propagatedBuildInputs = [ lz4 setuptools ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lz4 + psutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + threadpoolctl + ]; + + pytestFlagsArray = [ + "joblib/test" + ]; - pytestFlagsArray = [ "joblib/test" ]; disabledTests = [ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests @@ -36,6 +57,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/joblib/joblib/releases/tag/${version}"; description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 2d7d82fd6e46e..3353e5ec43806 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -2,29 +2,40 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder + +# build , poetry-core -, jsonschema + +# propagates , pathable , pyyaml -, typing-extensions +, referencing +, requests + +# tests , pytestCheckHook +, responses }: buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.1.4"; + version = "0.2.3"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kLCV9WPWGrVgpbueafMVqtGmj3ifrBzTChE2kyxpyZk="; + hash = "sha256-Sa97DwPnGMLmT00hVdkoGO7C0vrvtwxvUvv9lq4nCY4="; }; postPatch = '' - sed -i "/--cov/d" pyproject.toml + sed -i "/^--cov/d" pyproject.toml + + substituteInPlace pyproject.toml \ + --replace 'referencing = ">=0.28.0,<0.30.0"' 'referencing = ">=0.28.0"' ''; nativeBuildInputs = [ @@ -32,14 +43,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jsonschema pathable pyyaml - typing-extensions + referencing + requests ]; nativeCheckInputs = [ pytestCheckHook + responses ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix new file mode 100644 index 0000000000000..54b8d6df6ea1e --- /dev/null +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, importlib-resources +, pytestCheckHook +, pythonOlder +, referencing +}: + +buildPythonPackage rec { + pname = "jsonschema-specifications"; + version = "2023.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "jsonschema_specifications"; + inherit version; + hash = "sha256-yRpQQE6Iofa6QGNneOLuCPbiTFYT/kxTrCRXilp/crs="; + }; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + referencing + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonschema_specifications" + ]; + + meta = with lib; { + description = "Support files exposing JSON from the JSON Schema specifications"; + homepage = "https://github.com/python-jsonschema/jsonschema-specifications"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 52bc89511d23c..a23e3a5b931ca 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -5,13 +5,13 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling -, importlib-metadata , importlib-resources +, jsonschema-specifications , pkgutil-resolve-name -, pyrsistent +, pytestCheckHook , pythonOlder -, twisted -, typing-extensions +, referencing +, rpds-py # optionals , fqdn @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.17.3"; + version = "4.18.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; + hash = "sha256-+zZCc1OZ+pWMDSqtcFeQFVRZbGM0n09rKDxJPPaSol0="; }; postPatch = '' @@ -49,10 +49,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - pyrsistent - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions + jsonschema-specifications + referencing + rpds-py ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources pkgutil-resolve-name @@ -82,20 +81,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - twisted + pytestCheckHook ]; - checkPhase = '' - export JSON_SCHEMA_TEST_SUITE=json - trial jsonschema - ''; - pythonImportsCheck = [ "jsonschema" ]; meta = with lib; { - description = "An implementation of JSON Schema validation for Python"; + description = "An implementation of JSON Schema validation"; homepage = "https://github.com/python-jsonschema/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 9f17874dfc325..17ec031451375 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -61,6 +61,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + preCheck = '' export HOME=$TEMP ''; diff --git a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix index f95493513e677..bf9bc2bd7cd0e 100644 --- a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, ipython_genutils , jupyter-contrib-core , jupyter-highlight-selected-word , jupyter-nbextensions-configurator @@ -19,6 +20,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + ipython_genutils jupyter-contrib-core jupyter-highlight-selected-word jupyter-nbextensions-configurator diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 9532e5ca68a9d..b8a9a97e230a5 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -82,12 +82,17 @@ buildPythonPackage rec { flaky ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + preCheck = '' export HOME=$(mktemp -d) export PATH=$out/bin:$PATH ''; disabledTests = [ + "test_server_extension_list" "test_cull_idle" "test_server_extension_list" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index c729e1da53625..1905434759a2b 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.13.1"; + version = "24.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng="; + hash = "sha256-ygdGoZ7EISGfTXE/hI+il6ZhqKjBUEhn5Vv7XgkJFQk="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://github.com/jaraco/keyring"; - changelog = "https://github.com/jaraco/keyring/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ lovek323 dotlambda ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 9ba249f528166..f7c9ce32bb8d6 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -4,43 +4,36 @@ , azure-servicebus , backports-zoneinfo , buildPythonPackage -, cached-property , case , fetchPypi , hypothesis -, importlib-metadata , pyro4 , pytestCheckHook , pythonOlder , pytz , vine +, typing-extensions }: buildPythonPackage rec { pname = "kombu"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0ITsH5b3p8N7qegWgjvbwI8Px92zpb5VWAXmkhAil9g="; + hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI="; }; - postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytz>dev" "pytz" - ''; - propagatedBuildInputs = [ amqp vine + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo - ] ++ lib.optionals (pythonOlder "3.8") [ - cached-property - importlib-metadata ]; nativeCheckInputs = [ @@ -58,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/celery/kombu/releases/tag/v${version}"; description = "Messaging library for Python"; homepage = "https://github.com/celery/kombu"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 14d23a96d2627..a95db86509800 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi -, pbr, python-ldap, prettytable, fixtures, testresources, testtools }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, python-ldap +, prettytable +, six +, fixtures +, testresources +, testtools +}: buildPythonPackage rec { pname = "ldappool"; @@ -20,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ python-ldap prettytable ]; + propagatedBuildInputs = [ python-ldap prettytable six ]; nativeCheckInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 61da9ab759105..a8d3a6399e650 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-j28OQkJymkh6tIGYLoZLad7OUUImjZqXdqM2zU3haac="; + hash = "sha256-I1kVGbZI1hQRNv0e44giWiMqmeqaqFZks20IyFQ9VIU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index dfdbbe755dd98..e3afe80624fb0 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub , buildPythonPackage , python , llvm @@ -12,13 +12,19 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.39.1"; + # The main dependency of llvmlite is numba, which we currently package an + # untagged version of it (for numpy>1.25 support). That numba version + # requires at least this version of llvmlite (also not yet officially + # released, but at least tagged). + version = "0.41.0dev0"; disabled = isPyPy || !isPy3k; - src = fetchPypi { - inherit pname version; - hash = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI="; + src = fetchFromGitHub { + owner = "numba"; + repo = "llvmlite"; + rev = "v${version}"; + hash = "sha256-fsH+rqouweNENU+YlWr7m0bC0YdreQLNp1n2rwrOiFw="; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index cf43f6861c558..db531a65778f2 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.2"; + version = "4.9.3-3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - hash = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; + hash = "sha256-Vrizi+6jUUEx7qODU4PAH5ZmvBIyT9H18+QpYB0m1f4="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 9ad29d3a2c212..7de193bbbbd79 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.4.3"; + version = "3.4.4"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-o2MDsrSkR0fMA5I8AoQcJrpwNGO5lXJn8O47tQN7U6o="; + hash = "sha256-5PIIhbJVsotGwZ3BQ4x0I7WjgnGF3opNrn8J+xZCflg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index ed224b244f4b6..8c92723e4a064 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pillow, regex }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonRelaxDepsHook, pillow, regex }: buildPythonPackage rec { pname = "material-color-utilities-python"; @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "Pillow" + ]; + propagatedBuildInputs = [ pillow regex diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index dbc8c1da31d42..2cfd5d21db19c 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -76,7 +76,7 @@ let in buildPythonPackage rec { - version = "3.7.1"; + version = "3.7.2"; pname = "matplotlib"; format = "pyproject"; @@ -84,7 +84,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-e3MwXyXqtFQb1+4Llth+U66cnxgjvlZZuAbNhXhv6II="; + hash = "sha256-qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps="; }; env.XDG_RUNTIME_DIR = "/tmp"; @@ -121,6 +121,8 @@ buildPythonPackage rec { setuptools setuptools-scm numpy + ] ++ lib.optionals enableGtk3 [ + gobject-introspection ]; buildInputs = [ @@ -131,7 +133,6 @@ buildPythonPackage rec { ghostscript ] ++ lib.optionals enableGtk3 [ cairo - gobject-introspection gtk3 ] ++ lib.optionals enableTk [ libX11 diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh new file mode 100644 index 0000000000000..d2535d1fd59ad --- /dev/null +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -0,0 +1,6 @@ +# Add all of mesonFlags to -Csetup-args for pypa builds +for f in $mesonFlags; do + pypaBuildFlags+=" -Csetup-args=$f" + # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html + pipBuildFlags+=" --config-settings=setup-args=$f" +done diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 20008b2b53410..866512a4cfdd6 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.12.1"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-PVs+WB1wpYqXucEWp16Xp2zEtMfnX6Blj8g5I3Hi8sI="; + hash = "sha256-Y7MXAAFCXEL6TP7a25BRy9KJJf+O7XxA02ugCZ48dhg="; }; nativeBuildInputs = [ @@ -39,6 +39,9 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + setupHooks = [ + ./add-build-flags.sh + ]; # Ugly work-around. Drop ninja dependency. # We already have ninja, but it comes without METADATA. diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix new file mode 100644 index 0000000000000..1bc335fdbacef --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, gitpython +, mkdocs +, pytz +, pytestCheckHook +, git +}: + +buildPythonPackage rec { + pname = "mkdocs-git-revision-date-localized-plugin"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timvink"; + repo = "mkdocs-git-revision-date-localized-plugin"; + rev = "v${version}" ; + hash = "sha256-l7NUmsdd1FHkbdqtRcMQBfplZJgLCXrN+QuYaQLpz0k="; + }; + + propagatedBuildInputs = [ + gitpython + mkdocs + pytz + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + "tests/test_builds.py" + ]; + + pythonImportsCheck = [ "mkdocs_git_revision_date_localized_plugin" ]; + + meta = with lib; { + description = "MkDocs plugin that enables displaying the date of the last git modification of a page"; + homepage = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin"; + changelog = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix new file mode 100644 index 0000000000000..c329196d51de7 --- /dev/null +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, pybind11 +, numpy +, pytestCheckHook +, absl-py +}: + +buildPythonPackage rec { + pname = "ml-dtypes"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jax-ml"; + repo = "ml_dtypes"; + rev = "refs/tags/v${version}"; + hash = "sha256-eqajWUwylIYsS8gzEaCZLLr+1+34LXWhfKBjuwsEhhI="; + # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), + # the attempts to use the nixpkgs packaged eigen dependency have failed. + # Hence, we rely on the bundled eigen library. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + setuptools + pybind11 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + absl-py + ]; + + preCheck = '' + # remove src module, so tests use the installed module instead + mv ./ml_dtypes/tests ./tests + rm -rf ./ml_dtypes + ''; + + pythonImportsCheck = [ + "ml_dtypes" + ]; + + meta = with lib; { + description = "A stand-alone implementation of several NumPy dtype extensions used in machine learning libraries"; + homepage = "https://github.com/jax-ml/ml_dtypes"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage samuela ]; + }; +} diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 152c36848a9ef..14f4b76b48cff 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,16 +38,21 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxpxsP9Gedzo/yrpcz6ZbsC2wQbbk0EuDfhgb3kYZ8g="; + hash = "sha256-+ZKujqnHNQI0S69IxOxEeqnvv6iWW8CQho5hYyNPTrA="; }; + postPatch = '' + substituteInPlace requirements/core-requirements.txt \ + --replace "gunicorn<21" "gunicorn" + ''; + # Remove currently broken dependency `shap`, a model explainability package. # This seems quite unprincipled especially with tests not being enabled, # but not mlflow has a 'skinny' install option which does not require `shap`. diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index b83a6b8a068bc..c385661738b11 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hxXywlDZoQ1DUL/03UngIdlHke8Ey4rDbEV4JKxiGps="; + hash = "sha256-IDu+Yu9BKk4/ITkNY6YLVmJ5zNR6F4LF1vj8QIEW108="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 141caaad1928d..2623f5c376a65 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder # build-system @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.3.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,9 +41,17 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-dfKuIyzgZo5hAZHighpXH78dHJ1PMbyCakyxF34CnMQ="; + hash = "sha256-2PeE/L9J6J0IuUpHZasemM8xxefNJrdzYnutgJjevWQ="; }; + patches = [ + (fetchpatch { + # pytest 7.4 compat + url = "https://github.com/python/mypy/commit/0a020fa73cf5339a80d81c5b44e17116a5c5307e.patch"; + hash = "sha256-3HQPo+V7T8Gr92clXAt5QJUJPmhjnGjQgFq0qR0whfw="; + }) + ]; + nativeBuildInputs = [ mypy-extensions setuptools @@ -108,6 +117,8 @@ buildPythonPackage rec { "mypy/test/testdaemon.py" # fails to find setuptools "mypyc/test/test_commandline.py" + # fails to find hatchling + "mypy/test/testpep561.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 85489d4566ed2..354a937a61055 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -15,15 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.3"; - - disabled = pythonOlder "3.7"; - + version = "5.9.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SwIfyiTTp0e/TmJmlAM9eS1ZRwWCnl41sU7jNp+fZHc="; + hash = "sha256-On9S0EBjnL2KOJAhjIsP+5MhFYjFdEbJAJXjK6WIG10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index e6db538859fc1..c2717746bf690 100644 --- a/pkgs/development/python-modules/nclib/default.nix +++ b/pkgs/development/python-modules/nclib/default.nix @@ -6,17 +6,22 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.3"; - disabled = pythonOlder "3.5"; + version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk="; + hash = "sha256-sKbISlL5hOBu1j6zWSib2HjJCvEoMrqdwzgG2keMqDE="; }; # Project has no tests doCheck = false; - pythonImportsCheck = [ "nclib" ]; + + pythonImportsCheck = [ + "nclib" + ]; meta = with lib; { description = "Python module that provides netcat features"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 628742c72f300..957752040e43b 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -50,6 +50,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + env = { JUPYTER_PLATFORM_DIRS = 1; }; diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index ff64840fee7c9..ce438528bc285 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , paho-mqtt , poetry-core , psutil @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-h+jZWjDvTfW9XjoGhWYX08hgJ/Qp64MEaqHHwnahnC4="; }; + patches = [ + (fetchpatch { + name = "update-packaging-dependency.patch"; + url = "https://github.com/greenbone/notus-scanner/commit/bfa7d3d2e63e250ff25a66c60b782eb9da0e89e7.patch"; + hash = "sha256-hzS8TYBXDEq+cgWlp6fSOtSbyeX9EX2rURmnFMF5jN0="; + }) + ]; + pythonRelaxDeps = [ "python-gnupg" ]; diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix index 07e82c0ca6d76..c4c37b7ad3333 100644 --- a/pkgs/development/python-modules/numba-scipy/default.nix +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -6,6 +6,7 @@ , numba , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -25,14 +26,13 @@ buildPythonPackage rec { numba ]; - postPatch = '' - # https://github.com/numba/numba-scipy/pull/76 - substituteInPlace setup.py \ - --replace "scipy>=0.16,<=1.7.3" "scipy>=0.16" - ''; - nativeCheckInputs = [ pytestCheckHook + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "scipy" + "numba" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index d503307ce67ae..da0f72a43375c 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -2,7 +2,7 @@ , stdenv , pythonAtLeast , pythonOlder -, fetchPypi +, fetchFromGitHub , python , buildPythonPackage , setuptools @@ -27,23 +27,30 @@ let inherit (cudaPackages) cudatoolkit; in buildPythonPackage rec { - version = "0.56.4"; + # Using an untagged version, with numpy 1.25 support + version = "unstable-2023-08-02"; pname = "numba"; format = "setuptools"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Mtn+9BLIFIPX7+DOts9NMxD96LYkqc7MoA95BXOslu4="; + src = fetchFromGitHub { + owner = "numba"; + repo = "numba"; + rev = "fcf94205335dcc6135d2e19c07bbef968d13610d"; + # Upstream uses .gitattributes to inject information about the revision + # hash and the refname into `numba/_version.py`, see: + # + # - https://git-scm.com/docs/gitattributes#_export_subst and + # - https://github.com/numba/numba/blame/5ef7c86f76a6e8cc90e9486487294e0c34024797/numba/_version.py#L25-L31 + # + # Hence this hash may change if GitHub / Git will change it's behavior. + # Hopefully this will not happen until the next release. We are fairly sure + # that upstream relies on those strings to be valid, that's why we don't + # use `forceFetchGit = true;`.` If in the future we'll observe the hash + # changes too often, we can always use forceFetchGit, and inject the + # relevant strings ourselves, using `sed` commands, in extraPostFetch. + hash = "sha256-Wm1sV4uS/Xkz1BkT2xNmwgBZS0X8YziC6jlbfolXGB8="; }; - - postPatch = '' - substituteInPlace setup.py \ - --replace 'max_numpy_run_version = "1.24"' 'max_numpy_run_version = "1.25"' - substituteInPlace numba/__init__.py \ - --replace "elif numpy_version > (1, 23):" "elif numpy_version > (1, 24):" - ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ @@ -63,17 +70,7 @@ in buildPythonPackage rec { cudatoolkit.lib ]; - patches = [ - # fix failure in test_cache_invalidate (numba.tests.test_caching.TestCache) - # remove when upgrading past version 0.56 - (fetchpatch { - name = "fix-test-cache-invalidate-readonly.patch"; - url = "https://github.com/numba/numba/commit/993e8c424055a7677b2755b184fc9e07549713b9.patch"; - hash = "sha256-IhIqRLmP8gazx+KWIyCxZrNLMT4jZT8CWD3KcH4KjOo="; - }) - # Backport numpy 1.24 support from https://github.com/numba/numba/pull/8691 - ./numpy-1.24.patch - ] ++ lib.optionals cudaSupport [ + patches = lib.optionals cudaSupport [ (substituteAll { src = ./cuda_path.patch; cuda_toolkit_path = cudatoolkit; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 65a077392ff94..20019633d8ca2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -39,45 +39,36 @@ let }; }; }; -in buildPythonPackage (rec { +in buildPythonPackage rec { pname = "numpy"; - version = "1.24.2"; + version = "1.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-ADqfUw6IDLLNF3y6GvciC5qkLe+cSvwqL8Pua+frKyI="; + hash = "sha256-mjqfOmFIDMCGEXtCaovYaGnCE/xAcuYG8BxOS2brkr8="; }; - patches = lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ] - ++ lib.optionals stdenv.cc.isClang [ + patches = [ # f2py.f90mod_rules generates code with invalid function pointer conversions, which are # clang 16 makes an error by default. (fetchpatch { url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; }) - ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # Backport from 1.25. `platform.machine` returns `arm64` on aarch64-darwin, which causes - # differing results between `_selected_real_kind_func` and Fortran’s `selected_real_kind`. - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/afcedf4b63f4a94187e6995c2adea0da3bb18e83.patch"; - hash = "sha256-cxBoimX5a9wC2qUIGAo5o/M2E9+eV63bV2/wLmfDYKg="; - }) - ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. ./disable-failing-long-double-test-Rosetta-2.patch + ] + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ++ lib.optionals python.hasDistutilsCxxPatch [ + ./numpy-distutils-C++.patch ]; postPatch = '' @@ -91,6 +82,9 @@ in buildPythonPackage (rec { nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; + # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. + hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; + # we default openblas to build with 64 threads # if a machine has more than 64 threads, it will segfault # see https://github.com/xianyi/OpenBLAS/issues/2993 @@ -137,7 +131,4 @@ in buildPythonPackage (rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} // lib.optionalAttrs stdenv.cc.isClang { - # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. - hardeningDisable = [ "strictoverflow" ]; -}) +} diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 445cc705fac93..bd0aa88262df0 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -4,7 +4,7 @@ , graphviz , graphvizPkgs , isPyPy -, pytestCheckHook +, python , pythonOlder , substituteAll }: @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "3.6.0"; format = "setuptools"; - disabled = pythonOlder "3.5" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchPypi { inherit pname version; @@ -28,27 +28,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - graphviz - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; + passthru.optional-dependencies = { + ipython = [ + graphviz + ]; + }; pythonImportsCheck = [ "objgraph" ]; - pytestFlagsArray = [ - "tests.py" - ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} tests.py + runHook postCheck + ''; meta = with lib; { description = "Draws Python object reference graphs with graphviz"; homepage = "https://mg.pov.lt/objgraph/"; changelog = "https://github.com/mgedmin/objgraph/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index b5b2df878623b..e0e92178e4bda 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -1,4 +1,6 @@ { lib +, aiohttp +, asgiref , buildPythonPackage , django , djangorestframework @@ -7,36 +9,35 @@ , flask , httpx , isodate +, jsonschema , jsonschema-spec -, mock , more-itertools , openapi-schema-validator , openapi-spec-validator , parse -, pathable , poetry-core +, pytest-aiohttp , pytestCheckHook , pythonOlder , responses , requests , starlette -, typing-extensions , webob , werkzeug }: buildPythonPackage rec { pname = "openapi-core"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-xlrG2FF55qDsrkdSqCBLu3/QLtZs48ZUB90B2CemY64="; + hash = "sha256-2OcGaZQwzgxcwrXinmJjFc91620Ri0O79c8WZWfDdlQ="; }; postPatch = '' @@ -50,17 +51,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate more-itertools - pathable - more-itertools + parse openapi-schema-validator - jsonschema-spec openapi-spec-validator - typing-extensions - parse werkzeug + jsonschema-spec + asgiref + jsonschema ]; passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; django = [ django ]; @@ -80,7 +83,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - mock + pytest-aiohttp pytestCheckHook responses webob diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 19b3e9cc3e744..39074543b42f6 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -1,23 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system , poetry-core -, pytestCheckHook -, isodate + +# propagates , jsonschema +, jsonschema-specifications , rfc3339-validator + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.4.4"; + version = "0.6.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2XTCdp9dfzhNKCpq71pt7yEZm9abiEmFHD/114W+jOQ="; + hash = "sha256-859v6KqIRfUq4d/KbkvGnGqlxz6BXTl+tKQHPhtkTH0="; }; postPatch = '' @@ -30,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema + jsonschema-specifications rfc3339-validator ]; @@ -40,6 +50,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { + changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${version}"; description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; homepage = "https://github.com/p1c2u/openapi-schema-validator"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 5bcbca949fd19..847a9fdcbddf3 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system , poetry-core # propagates @@ -10,31 +12,30 @@ , jsonschema-spec , lazy-object-proxy , openapi-schema-validator -, pyyaml - -# optional -, requests # tests -, mock , pytestCheckHook }: buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.5.6"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # no tests via pypi sdist src = fetchFromGitHub { owner = "p1c2u"; - repo = pname; + repo = "openapi-spec-validator"; rev = "refs/tags/${version}"; - hash = "sha256-BIGHaZhrEc7wcIesBIXdVRzozllCNOz67V+LmQfZ8oY="; + hash = "sha256-sGr4dH6Twyi4OeCAXZiboN75dYZ6wJ0pWMzV9zOfee0="; }; + postPatch = '' + sed -i '/--cov/d' pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -48,14 +49,6 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.requests = [ - requests - ]; - - preCheck = '' - sed -i '/--cov/d' pyproject.toml - ''; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 2b66b67b44062..b405a3b8fca9d 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.3.1"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+g/YOGv311SaOs65xOKai3BJp4GbhkD1awEFL4oQLMo="; + hash = "sha256-NhUSnttnyCr70aFwbpFf+mjg7r/JnJA8NDqsZRfdWFg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index aa646a08ee90c..7d89f5778c732 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -3,6 +3,7 @@ , fetchPypi , fixtures , pbr +, six , subunit , callPackage }: @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "oslotest"; version = "4.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -20,6 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fixtures + six subunit ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index e77c715e45ab3..0c4678a460acf 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -10,14 +10,14 @@ let packaging = buildPythonPackage rec { pname = "packaging"; - version = "23.0"; + version = "23.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tq0pf4kH3g+i/hzL0m/a84f19Hxydf7fjM6J+ZRGz5c="; + hash = "sha256-o5KYDSts/6ZEQxiYvlSwBFFRMZ0efsNPDP7Uh2fdM08="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d74c63b1030b1..0c3b28d1d215d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,114 +2,218 @@ , stdenv , buildPythonPackage , fetchPypi -, python , pythonOlder + +# build-system , cython +, setuptools +, versioneer + +# propagates , numpy , python-dateutil , pytz -# Test inputs +, tzdata + +# optionals +, beautifulsoup4 +, bottleneck +, blosc2 +, brotlipy +, fsspec +, gcsfs +, html5lib +, jinja2 +, lxml +, matplotlib +, numba +, numexpr +, odfpy +, openpyxl +, psycopg2 +, pyarrow +, pymysql +, pyqt5 +, pyreadstat +, python-snappy +, qtpy +, s3fs +, scipy +, sqlalchemy +, tables +, tabulate +, xarray +, xlrd +, xlsxwriter +, zstandard + +# tests +, adv_cmds +, glibc , glibcLocales , hypothesis -, jinja2 , pytestCheckHook , pytest-xdist , pytest-asyncio -, xlsxwriter -# Darwin inputs +, python , runtimeShell -, libcxx }: buildPythonPackage rec { pname = "pandas"; - version = "1.5.3"; - format = "setuptools"; + version = "2.0.3"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dKP9flp+wFLxgyc9x7Cs06hj7fdSD106F2XAT/2zsLE="; + hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + setuptools + cython + numpy + versioneer + ] ++ versioneer.optional-dependencies.toml; - buildInputs = lib.optional stdenv.isDarwin libcxx; + enableParallelBuilding = true; propagatedBuildInputs = [ numpy python-dateutil pytz + tzdata ]; + passthru.optional-dependencies = let + extras = { + aws = [ + s3fs + ]; + clipboard = [ + pyqt5 + qtpy + ]; + compression = [ + brotlipy + python-snappy + zstandard + ]; + computation = [ + scipy + xarray + ]; + excel = [ + odfpy + openpyxl + # TODO: pyxlsb + xlrd + xlsxwriter + ]; + feather = [ + pyarrow + ]; + fss = [ + fsspec + ]; + gcp = [ + gcsfs + # TODO: pandas-gqb + ]; + hdf5 = [ + blosc2 + tables + ]; + html = [ + beautifulsoup4 + html5lib + lxml + ]; + mysql = [ + sqlalchemy + pymysql + ]; + output_formatting = [ + jinja2 + tabulate + ]; + parquet = [ + pyarrow + ]; + performance = [ + bottleneck + numba + numexpr + ]; + plot = [ + matplotlib + ]; + postgresql = [ + sqlalchemy + psycopg2 + ]; + spss = [ + pyreadstat + ]; + sql-other = [ + sqlalchemy + ]; + xml = [ + lxml + ]; + }; + in extras // { + all = lib.concatLists (lib.attrValues extras); + }; + + # Doesn't work with -Werror,-Wunused-command-line-argument + # https://github.com/NixOS/nixpkgs/issues/39687 + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; + nativeCheckInputs = [ glibcLocales hypothesis - jinja2 pytest-asyncio pytest-xdist pytestCheckHook - xlsxwriter + ] ++ lib.optionals (stdenv.isLinux) [ + # for locale executable + glibc + ] ++ lib.optionals (stdenv.isDarwin) [ + # for locale executable + adv_cmds ]; - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture - # don't max out build cores, it breaks tests dontUsePytestXdist = true; + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh "--skip-db" "--skip-slow" "--skip-network" - "-m" "'not single_cpu'" + "-m" "'not single_cpu and not slow_arm'" "--numprocesses" "4" ]; disabledTests = [ - # Locale-related - "test_names" - "test_dt_accessor_datetime_name_accessors" - "test_datetime_name_accessors" - # Disable IO related tests because IO data is no longer distributed - "io" - # Tries to import from pandas.tests post install - "util_in_top_level" - # Tries to import compiled C extension locally - "test_missing_required_dependency" - # AssertionError with 1.2.3 - "test_from_coo" - # AssertionError: No common DType exists for the given inputs - "test_comparison_invalid" - # AssertionError: Regex pattern '"quotechar" must be string, not int' - "python-kwargs2" - # Tests for rounding errors and fails if we have better precision - # than expected, e.g. on amd64 with FMA or on arm64 - # https://github.com/pandas-dev/pandas/issues/38921 - "test_rolling_var_numerical_issues" - # Requires mathplotlib - "test_subset_for_boolean_cols" - # DeprecationWarning from numpy - "test_sort_values_sparse_no_warning" - ] ++ lib.optionals stdenv.isDarwin [ - "test_locale" - "test_clipboard" - # ValueError: cannot reindex on an axis with duplicate labels - # - # Attempts to reproduce this problem outside of Hydra failed. - "test_reindex_timestamp_with_fold" + # AssertionError: Did not see expected warning of class 'FutureWarning' + "test_parsing_tzlocal_deprecated" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} + "test_binops" ]; # Tests have relative paths, and need to reference compiled C extensions # so change directory where `import .test` is able to be resolved preCheck = '' - cd $out/${python.sitePackages}/pandas + export HOME=$TMPDIR export LC_ALL="en_US.UTF-8" - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + cd $out/${python.sitePackages}/pandas '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. @@ -121,19 +225,24 @@ buildPythonPackage rec { export PATH=$(pwd):$PATH ''; - enableParallelBuilding = true; - - pythonImportsCheck = [ "pandas" ]; + pythonImportsCheck = [ + "pandas" + ]; meta = with lib; { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; - homepage = "https://pandas.pydata.org/"; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; - description = "Python Data Analysis Library"; + description = "Powerful data structures for data analysis, time series, and statistics"; + downloadPage = "https://github.com/pandas-dev/pandas"; + homepage = "https://pandas.pydata.org"; license = licenses.bsd3; + longDescription = '' + Flexible and powerful data analysis / manipulation library for + Python, providing labeled data structures similar to R data.frame + objects, statistical functions, and much more. + ''; maintainers = with maintainers; [ raskin fridh knedlsepp ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index eb1d1f3df3a1a..96f626b24b61a 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.1"; + version = "2.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-g8VL5nO180XplMgbbeeJIp6lmbWcMKdY/IftlkL6e5U="; + hash = "sha256-46HTamiy+8fiGVeviYqXsjwu+PEBE38y19cBVRc+zm0="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index f07e3ca82faa6..be5573a0055cd 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.1.2"; + version = "1.1.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1PpzWmRffpWmvrNKK19+jgDZPdBDnXPzHMguQLW4/c4="; + hash = "sha256-f0kSHnC0Lcopb6yWIhDdLaB6OVdfxWcxN61mFjOyzz8="; }; preCheck = '' diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 5c2fd23146598..66d7cf680bfd6 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , hypothesis , pythonOlder -, importlib-metadata , jbig2dec , deprecation , lxml @@ -19,14 +18,13 @@ , python-xmp-toolkit , qpdf , setuptools -, setuptools-scm , substituteAll , wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "7.2.0"; + version = "8.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-acGIhIWC1nUQiN0iwb1kLKxz+ytIqYIW4VXF45Tx50g="; + hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw="; }; patches = [ @@ -57,8 +55,6 @@ buildPythonPackage rec { --replace "shims_enabled = not cflags_defined" "shims_enabled = False" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ qpdf ]; @@ -66,7 +62,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools - setuptools-scm wheel ]; @@ -85,8 +80,6 @@ buildPythonPackage rec { lxml packaging pillow - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; pythonImportsCheck = [ "pikepdf" ]; diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 843f9dfdf2411..1b17e24115362 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tox.ini \ --replace " --cov --cov-report term-missing:skip-covered" "" + substituteInPlace pilkit/processors/resize.py \ + --replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index b3ff63b1fb935..f1489e1f458d2 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -13,25 +13,17 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.5.0"; - format = "setuptools"; + version = "10.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; + hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; }; - patches = [ - (fetchpatch { - # Fixed type handling for include and lib directories; Remove with 10.0.0 - url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; - hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 2259ecf655d75..9252a2a5fbe1d 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,10 +2,15 @@ , buildPythonPackage , fetchPypi , pythonOlder + +# build-system +, setuptools , setuptools-scm -, importlib-metadata -, packaging -# Check Inputs + +# propagates +, typing-extensions + +# tests , pytestCheckHook , pytest-subtests , numpy @@ -15,20 +20,25 @@ buildPythonPackage rec { pname = "pint"; - version = "0.20.1"; + version = "0.22"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - hash = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; + hash = "sha256-LROfarvPMBbK19POwFcH/pCKxPmc9Zrt/W7mZ7emRDM="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ packaging ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook @@ -38,13 +48,17 @@ buildPythonPackage rec { uncertainties ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$(mktemp -d) ''; + disabledTests = [ + # https://github.com/hgrecco/pint/issues/1825 + "test_equal_zero_nan_NP" + ]; + meta = with lib; { + changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES"; description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 9d2deb68d4429..f64a76d3e6259 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.5.1"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/qi22jiF+P7XcG/D+dxoOrHk89amdBoGewrTqZZOsoM="; + hash = "sha256-gBiXdnBWp0SlpE6TQPONTXEsQ2XFGCANGdNM/gv7V5s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 46aebb5195008..e6473e98a282d 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,31 +1,40 @@ { buildPythonPackage , lib -, fetchPypi +, fetchFromGitHub , setuptools-scm , pythonOlder , importlib-metadata +, callPackage }: buildPythonPackage rec { pname = "pluggy"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pluggy"; + rev = "refs/tags/${version}"; + hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; }; nativeBuildInputs = [ setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # To prevent infinite recursion with pytest doCheck = false; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = { + changelog = "https://github.com/pytest-dev/pluggy/blob/${src.rev}/CHANGELOG.rst"; description = "Plugin and hook calling mechanisms for Python"; homepage = "https://github.com/pytest-dev/pluggy"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pluggy/tests.nix b/pkgs/development/python-modules/pluggy/tests.nix new file mode 100644 index 0000000000000..dc6e16e7b2d79 --- /dev/null +++ b/pkgs/development/python-modules/pluggy/tests.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage +, pluggy +, pytestCheckHook +}: + +buildPythonPackage { + pname = "pluggy-tests"; + inherit (pluggy) version; + format = "other"; + + inherit (pluggy) src; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pluggy + pytestCheckHook + ]; +} diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index daf45528202f9..270c78a69826f 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -11,7 +11,6 @@ , pytest-mock , pytestCheckHook , setuptools -, tomlkit , virtualenv }: @@ -54,7 +53,6 @@ buildPythonPackage rec { pytest-mock pytestCheckHook setuptools - tomlkit virtualenv ]; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 7f1ac487976cf..f1f7647defba4 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pox"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6CUiUpdjjW49SUFfjPtlQHpdFeVvL7f+nZueMFDGXuE="; + hash = "sha256-4c7WbyoMkqWM82Rrx8y4tHc9QIhLdvhe7aBnBHSHFmc="; }; # Test sare failing the sandbox diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 572e1efceb67b..1fffa8cde714c 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "prance"; - version = "0.22.02.22.0"; + version = "23.06.21.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-NtIbZp34IcMYJzaNQVL9GLdNS3NYOCRoWS1wGg/gLVA="; + hash = "sha256-p+LZbQal4DPeMp+eJ2O83rCaL+QIUDcU34pZhYdN4bE="; }; postPatch = '' @@ -70,6 +70,7 @@ buildPythonPackage rec { "test_convert_defaults" "test_convert_output" "test_fetch_url_http" + "test_openapi_spec_validator_validate_failure" ]; pythonImportsCheck = [ "prance" ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index ef112d3bb617e..7ba24e4bd5260 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -24,13 +24,13 @@ } ./setup-hook.sh; in buildPythonPackage rec { pname = "pybind11"; - version = "2.10.4"; + version = "2.11.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-n7nLEG2+sSR9wnxM+C8FWc2B+Mx74Pan1+IQf+h2bGU="; + hash = "sha256-sO/Fa+QrAKyq2EYyYMcjPrYI+bdJIrDoj6L3JHoDo3E="; }; postPatch = '' @@ -87,7 +87,7 @@ in buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ + disabledTests = lib.optionals stdenv.isDarwin [ # expects KeyError, gets RuntimeError # https://github.com/pybind/pybind11/issues/4243 "test_cross_module_exception_translator" diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index f07c8062c1086..47e90eb8726a9 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.17.0"; + version = "3.18.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; - rev = "v${version}"; - hash = "sha256-xsfd+dbaNOPuD0ulvpLPBPtcFgmJqX1VuunwNMcqh+Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-6oXXy18KlSjfyZhfMnIgnu34u/9sG0TPYvPJ8ovTqMA="; }; postPatch = '' @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Self-contained cryptographic library"; homepage = "https://github.com/Legrandin/pycryptodome"; + changelog = "https://github.com/Legrandin/pycryptodome/blob/v${version}/Changelog.rst"; license = with licenses; [ bsd2 /* and */ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydantic-core/01-remove-benchmark-flags.patch b/pkgs/development/python-modules/pydantic-core/01-remove-benchmark-flags.patch new file mode 100644 index 0000000000000..a5c27e469a92c --- /dev/null +++ b/pkgs/development/python-modules/pydantic-core/01-remove-benchmark-flags.patch @@ -0,0 +1,18 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 1602e32..507048d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -72,13 +72,6 @@ filterwarnings = [ + ] + timeout = 30 + xfail_strict = true +-# min, max, mean, stddev, median, iqr, outliers, ops, rounds, iterations +-addopts = [ +- '--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations', +- '--benchmark-group-by', 'group', +- '--benchmark-warmup', 'on', +- '--benchmark-disable', # this is enable by `make benchmark` when you actually want to run benchmarks +-] + + [tool.coverage.run] + source = ['pydantic_core'] diff --git a/pkgs/development/python-modules/pydantic-core/Cargo.lock b/pkgs/development/python-modules/pydantic-core/Cargo.lock new file mode 100644 index 0000000000000..05a29d770d838 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-core/Cargo.lock @@ -0,0 +1,662 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "enum_dispatch" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "proc-macro2" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pydantic-core" +version = "2.3.0" +dependencies = [ + "ahash", + "base64", + "enum_dispatch", + "idna 0.3.0", + "mimalloc", + "num-bigint", + "pyo3", + "pyo3-build-config", + "python3-dll-a", + "regex", + "serde", + "serde_json", + "speedate", + "strum", + "strum_macros 0.24.3", + "url", + "version_check", +] + +[[package]] +name = "pyo3" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "num-bigint", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustversion" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "serde_json" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "speedate" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" +dependencies = [ + "strum", + "strum_macros 0.25.1", +] + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.1", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "strum_macros" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.25", +] + +[[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.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" + +[[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 = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix new file mode 100644 index 0000000000000..c61a060fd4324 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, typing-extensions +, pytestCheckHook +, hypothesis +, pytest-timeout +, pytest-mock +, dirty-equals +}: + +buildPythonPackage rec { + pname = "pydantic-core"; + version = "2.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-core"; + rev = "v${version}"; + hash = "sha256-Wi+b+xiJtVi3KIy6bzT29kyHFSI7mbMNrLa/Iu3cTEY="; + }; + + patches = [ + ./01-remove-benchmark-flags.patch + ]; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + typing-extensions + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "pydantic_core" ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-timeout + dirty-equals + pytest-mock + ]; + disabledTests = [ + # RecursionError: maximum recursion depth exceeded while calling a Python object + "test_recursive" + ]; + disabledTestPaths = [ + # no point in benchmarking in nixpkgs build farm + "tests/benchmarks" + ]; + + meta = with lib; { + description = "Core validation logic for pydantic written in rust"; + homepage = "https://github.com/pydantic/pydantic-core"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index cc79c43febd7c..8ee2f8d98acf4 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , numpy , psutil , pytestCheckHook @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-TDU/V7kY7zVxiP4OVjGqpsRVYplpkgCly2qAOqhZONo="; }; + patches = [ + # https://github.com/fabioz/PyDev.Debugger/pull/258 + (fetchpatch { + name = "numpy-1.25-test-compatibility.patch"; + url = "https://github.com/fabioz/PyDev.Debugger/commit/6f637d951cda62dc2202a2c7b6af526c4d1e8a00.patch"; + hash = "sha256-DLzZZwQHtqGZGA8nsBLNQqamuI4xUfQ89Gd21sJa9/s="; + }) + ]; + + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ numpy psutil diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 0ce6dc642448d..c7e4979d13724 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,7 @@ , cffi , fetchPypi , isPyPy -, libgit2 +, libgit2_1_6 , pycparser , pytestCheckHook , pythonOlder @@ -25,11 +25,11 @@ buildPythonPackage rec { }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2}/lib" + export DYLD_LIBRARY_PATH="${libgit2_1_6}/lib" ''; buildInputs = [ - libgit2 + libgit2_1_6 ]; propagatedBuildInputs = [ @@ -58,14 +58,6 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - # setup.py check is broken - # https://github.com/libgit2/pygit2/issues/868 - dontUseSetuptoolsCheck = true; - - # TODO: Test collection is failing - # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 - doCheck = false; - pythonImportsCheck = [ "pygit2" ]; diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 152e9463b0e2e..635707160305b 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pygments_better_html"; - version = "0.1.4"; + version = "0.1.5"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "028szd3k295yhz943bj19i4kx6f0pfh1fd2q14id0g84dl4i49dm"; + sha256 = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index a7b2acd55ca91..8f32d26ebc249 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, docutils -, lxml + +# build-system +, setuptools + +# tests , pytestCheckHook , wcag-contrast-ratio }: @@ -10,22 +13,23 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.14.0"; + version = "2.15.1"; + format = "pyproject"; src = fetchPypi { pname = "Pygments"; inherit version; - hash = "sha256-s+0GqeismpquWm9dvniopYZV0XtDuTwHjwlN3Edq4pc="; + hash = "sha256-is5NPB3UgYlLIAX1YOrQ+fGe5k/pgzZr4aIeFx0Sd1w="; }; - propagatedBuildInputs = [ - docutils + nativeBuildInputs = [ + setuptools ]; # circular dependencies if enabled by default doCheck = false; + nativeCheckInputs = [ - lxml pytestCheckHook wcag-contrast-ratio ]; @@ -35,13 +39,16 @@ let pygments = buildPythonPackage "tests/examplefiles/bash/ltmain.sh" ]; - pythonImportsCheck = [ "pygments" ]; + pythonImportsCheck = [ + "pygments" + ]; passthru.tests = { check = pygments.overridePythonAttrs (_: { doCheck = true; }); }; meta = with lib; { + changelog = "https://github.com/pygments/pygments/releases/tag/${version}"; homepage = "https://pygments.org/"; description = "A generic syntax highlighter"; mainProgram = "pygmentize"; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 55e682e074144..cef52b754ad6f 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ="; + hash = "sha256-V+KNFW49XBAIjgxoq7kL+sPfgrQKcb0NqiDGXM1cI94="; }; postPatch = '' @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); + disabledTests = [ + # requires internet connection + "test_get_jwt_set_sslcontext_default" + ]; + pythonImportsCheck = [ "jwt" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 1ea6196dcc549..a037511288f85 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-pICSU33n/oH+LRbWNYOdnTaa5qAGRRXWsO1NjO4ylzw="; + hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M="; }; propagatedBuildInputs = [ psutil six future ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 7ce16743125a1..a3e7184f715ef 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.16.2"; + version = "2.17.5"; format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - hash = "sha256-xNCGf4CsxEKScIn6dl2Ka31P6bhMo5fTs9TIQz+vPiM="; + hash = "sha256-cmH6Q6/XJXx8EXDIsik1Aheu9hYGvvlNvWBUCdmC3P8="; }; nativeBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { # implementation relies on the '__implements__' attribute proposed # in PEP 245, which was rejected in 2006. "-W" "ignore::DeprecationWarning" + "-v" ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index db77f854dbb30..4e67fd0783d52 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "23.1.1"; + version = "23.2.0"; format = "setuptools"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc="; + hash = "sha256-J2+TH1WkUufeppxxc+mE6ypEB85BPJGKo0tV+C+bi6w="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix index c7abf88c3da79..a1df192ac223a 100644 --- a/pkgs/development/python-modules/pyopnsense/default.nix +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -4,10 +4,10 @@ , fixtures , mock , pbr -, pytest-cov , pytestCheckHook , pythonOlder , requests +, testtools }: buildPythonPackage rec { @@ -29,8 +29,8 @@ buildPythonPackage rec { nativeCheckInputs = [ fixtures mock - pytest-cov pytestCheckHook + testtools ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 115729b647668..30c63528514f2 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { pyparsing numpy astropy + cython ]; # Upstream patches needed for the tests to pass diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index e13f67ec83b54..96179595a9aed 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.20.3"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I="; + hash = "sha256-Wpo8MpCPGiXrckT2x5/yBYtGlzso/L2urG7yGc7SPkA="; }; outputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; - changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/docs/source/reference/changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-asyncio/tests.nix b/pkgs/development/python-modules/pytest-asyncio/tests.nix index 94e6e1855afbb..7fd26c85488de 100644 --- a/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -10,6 +10,8 @@ buildPythonPackage { pname = "pytest-asyncio-tests"; inherit (pytest-asyncio) version; + format = "other"; + src = pytest-asyncio.testout; dontBuild = true; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index dd93d6bac25b0..7df529a837382 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; + hash = "sha256-OQSxPfv+xH8AO453/VtYnNEZBKId3xqzimTyBNahDvY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 3d68c2dccc465..1d03413290a78 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8="; + hash = "sha256-uu2bO2uud711uSOODtHuaQOkKAaunWrv+4dUzVWE1P8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 77290573dc16b..efde539cb23f1 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -1,42 +1,59 @@ { lib , buildPythonPackage -, factory_boy , fetchFromGitHub -, inflection -, mock + +# build-system +, poetry-core + +# unpropagated , pytest -, pytestcache + +# propagated +, inflection +, factory_boy +, typing-extensions + +# tests , pytestCheckHook -, pytest-cov }: buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.1.0"; + version = "2.5.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; + sha256 = "sha256-zxgezo2PRBKs0mps0qdKWtBygunzlaxg8s9BoBaU1Ig="; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ factory_boy inflection + typing-extensions + ]; + + pythonImportsCheck = [ + "pytest_factoryboy" ]; nativeCheckInputs = [ - mock pytestCheckHook - pytestcache - pytest-cov ]; - pytestFlagsArray = [ "--ignore=docs" ]; - pythonImportsCheck = [ "pytest_factoryboy" ]; + pytestFlagsArray = [ + "--ignore=docs" + ]; meta = with lib; { description = "Integration of factory_boy into the pytest runner"; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index feae849013045..01ef1025904e6 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs="; + hash = "sha256-bjysG+7niSUBl8YMWR8pr7oOz9GDbSfq3PeloYBkq3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 7d1ec8696c218..7b4a285e35521 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage , fetchPypi -, poetry-core +, hatch-vcs +, hatchling , pytest , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; - version = "2.0.4"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_metadata"; inherit version; - hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4="; + hash = "sha256-dpqcZdKIS9WDvGJrCs53rRXb4C3ZGpEG1H/UbZwlaco="; }; nativeBuildInputs = [ - poetry-core - setuptools-scm + hatchling + hatch-vcs ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 7dc15e3cd276f..260c71ac71ff5 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.10.0"; + version = "3.11.1"; disabled = pythonOlder "3.7"; @@ -19,17 +19,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8="; + hash = "sha256-f2sSVgKsbXQ+Ujrgv6ceGml6L1U0BkUoxv+EwvfC/H8="; }; - patches = [ - (fetchpatch { - # Remove unnecessary py.code import - url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch"; - hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 7e05104ff6374..7c723e4cdc252 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -8,22 +8,27 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.12.0"; - format = "setuptools"; + version = "3.13.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = pname; owner = "pytest-dev"; rev = version; - hash = "sha256-n/Xp/HghqcQUreez+QbR3Mi5hE1U4zoOJCdFqD+pVBk="; + hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -47,6 +52,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/pytest-dev/pytest-randomly/blob/${version}/CHANGELOG.rst"; description = "Pytest plugin to randomly order tests and control random.seed"; homepage = "https://github.com/pytest-dev/pytest-randomly"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index a0aac8a9d08a0..f030960df6553 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "11.1.2"; + version = "12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VWEWYehz8cr6OEyC8I0HiDlU9LdkNfS4pbRwwZVFc94="; + hash = "sha256-eE9GL6h/6b33gdACfYVrR6S/5sEq8Qj2vYhwV6kXtI4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 0da33a770068f..b391ece3556aa 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -3,22 +3,24 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ZYaZ8F5HoweMtznpw7R5U87HmQQh/IJTy03CHq3+xc="; + hash = "sha256-UYZciEV1RfUftyARlC8KPGkB7p4ky/ttG53BNIuvvjc="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 61f12a792d98e..5c260f4321612 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.2.1"; + version = "3.3.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GEm9mNiyQrlI5HLbdHjgkL8zYZEqj+2HmS7ZQIX1Ryc="; + hash = "sha256-1e4FIOsbe8ylCmClGKt6dweZKBLFeBmPi0T9+seOjJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 80ea02356cdb1..5fde855e58e3e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.2.1"; + version = "7.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1F4JUvNyckGRi4/Q83b1/2swHMB3fG+aVWk1yS2KfUI="; + hash = "sha256-tL+MRb1Zk07YQAGtUeEbTuQNQKEinSx5+cWSsKP2vYo="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 8c51d9942f6b4..1d79ad756eab8 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,33 +1,40 @@ { lib , stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -, pythonAtLeast -, pkg-config -, alsa-lib -, libjack2 -, tox -, flake8 , alabaster +, alsa-lib +, buildPythonPackage , CoreAudio , CoreMIDI , CoreServices +, fetchPypi +, flake8 +, libjack2 +, meson-python +, pkg-config +, pythonOlder +, setuptools +, tox }: buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.9"; + version = "1.5.4"; + format = "pyproject"; - # https://github.com/SpotlightKid/python-rtmidi/issues/115 - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "bfeb4ed99d0cccf6fa2837566907652ded7adc1c03b69f2160c9de4082301302"; + pname = "python_rtmidi"; + inherit version; + hash = "sha256-sLUGQoDba3iiYvqUFwMbIktSdZBb0OLhccfQ++FFRP0="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson-python + pkg-config + setuptools + ]; + buildInputs = [ libjack2 ] ++ lib.optionals stdenv.isLinux [ @@ -37,15 +44,21 @@ buildPythonPackage rec { CoreMIDI CoreServices ]; + nativeCheckInputs = [ tox flake8 alabaster ]; + pythonImportsCheck = [ + "rtmidi" + ]; + meta = with lib; { description = "A Python binding for the RtMidi C++ library implemented using Cython"; homepage = "https://github.com/SpotlightKid/python-rtmidi"; + changelog = "https://github.com/SpotlightKid/python-rtmidi/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index ef03e76947637..dcb03ad0c5179 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -4,12 +4,10 @@ , fetchFromGitHub , openmp , ply -, networkx -, decorator , gast -, six , numpy , beniget +, xsimd , isPy3k , substituteAll }: @@ -19,13 +17,13 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.11.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - hash = "sha256-F9gUZOTSuiqvfGoN4yQqwUg9mnCeBntw5eHO7ZnjpzI="; + hash = "sha256-baDrReJgQXbaKA8KNhHiFjr0X34yb8WK/nUJmiM9EZs="; }; patches = [ @@ -36,12 +34,15 @@ in buildPythonPackage rec { }) ]; + # xsimd: unvendor this header-only C++ lib + postPatch = '' + rm -r third_party/xsimd + ln -s '${lib.getDev xsimd}'/include/xsimd third_party/ + ''; + propagatedBuildInputs = [ ply - networkx - decorator gast - six numpy beniget ]; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7cf21f3cc667c..0da6f9c8eb2cf 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2023.1"; + version = "2023.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8Q5CUiCu+h/5JTQrZY/wLcM1l8IfuI16Y/lEG/LnpQ4="; + hash = "sha256-gGN4c9IG9rzt9820atk+horLTqIlbbBS38yocr3QMh8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e9526ebb354ad..b73af6f8658bf 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.2.0"; + version = "2.3.0"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KolC1lcJWOcVjFEEYK2RNZodVrS/GjBzhlQ6z8kFOmE="; + hash = "sha256-eDQQPIyUUEkvpXjWAcyljlFgVlu9is4fPPUTudP7NF4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 7c19e55a7f743..a7270958387df 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -3,24 +3,30 @@ , pythonOlder , fetchFromGitHub , cython +, setuptools , libyaml , python }: buildPythonPackage rec { pname = "pyyaml"; - version = "6.0"; + version = "6.0.1"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "yaml"; repo = "pyyaml"; rev = version; - hash = "sha256-wcII32mRgRRmAgojntyxBMQkjvxU2jylCgVzlHAj2Xc="; + hash = "sha256-YjWMyMVDByLsN5vEecaYjHpR1sbBey1L/khn4oH9SPA="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + setuptools + ]; buildInputs = [ libyaml ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 519eb31a5b1e2..57b16e254fcf9 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -4,6 +4,7 @@ , ipykernel , jupyter-core , jupyter-client +, ipython_genutils , pygments , pyqt5 , pytestCheckHook @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel + ipython_genutils jupyter-core jupyter-client pygments diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix index 364a5e6098a1d..259871b4ef0cd 100644 --- a/pkgs/development/python-modules/quantulum3/default.nix +++ b/pkgs/development/python-modules/quantulum3/default.nix @@ -12,6 +12,7 @@ , joblib , wikipedia , stemming +, setuptools }: let pname = "quantulum3"; @@ -40,6 +41,7 @@ buildPythonPackage { joblib wikipedia stemming + setuptools ]; pythonImportsCheck = [ "quantulum3" ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index aaf6e77c0305f..287104e5b78b8 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.0.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-rpUrMHIBr7sb0Cib6WYdLJ3KOPEgRnB0DCV/df1uE1A="; + hash = "sha256-nmPOYiozt5mDvFmEkRTIblECcGjV5650wZGGq+iSMPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index f6ccd201df97b..37e418f3ea441 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -9,56 +9,59 @@ , pytestCheckHook , pythonOlder , rpds-py -, setuptools-scm }: -buildPythonPackage rec { - pname = "referencing"; - version = "0.30.0"; - format = "pyproject"; - disabled = pythonOlder "3.7"; +let + self = buildPythonPackage rec { + pname = "referencing"; + version = "0.30.0"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "python-jsonschema"; - repo = "referencing"; - rev = "refs/tags/v${version}"; - fetchSubmodules = true; - hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; - }; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-jsonschema"; + repo = "referencing"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; - postPatch = '' - sed -i "/Topic/d" pyproject.toml - ''; + propagatedBuildInputs = [ + attrs + rpds-py + ]; - nativeBuildInputs = [ - hatch-vcs - hatchling - setuptools-scm - ]; + nativeCheckInputs = [ + jsonschema + pytest-subtests + pytestCheckHook + ]; - propagatedBuildInputs = [ - attrs - rpds-py - ]; + # avoid infinite recursion with jsonschema + doCheck = false; - nativeCheckInputs = [ - jsonschema - pytest-subtests - pytestCheckHook - ]; + passthru.tests.referencing = self.overridePythonAttrs { doCheck = true; }; - pythonImportsCheck = [ - "referencing" - ]; + pythonImportsCheck = [ + "referencing" + ]; - meta = with lib; { - description = "Cross-specification JSON referencing"; - homepage = "https://github.com/python-jsonschema/referencing"; - changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + meta = with lib; { + description = "Cross-specification JSON referencing"; + homepage = "https://github.com/python-jsonschema/referencing"; + changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/repath/default.nix b/pkgs/development/python-modules/repath/default.nix index 619036f4b75e6..f66a42155da0d 100644 --- a/pkgs/development/python-modules/repath/default.nix +++ b/pkgs/development/python-modules/repath/default.nix @@ -1,7 +1,7 @@ { lib -, python3 , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-gpITm6xqDkP9nXBgXU6NrrJdRmcuSE7TGiTHzgrvD7c="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index cfb58b4faef48..d7b6f01d16c25 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -1,22 +1,21 @@ { lib , betamax , buildPythonPackage -, fetchpatch , fetchPypi -, mock , pyopenssl , pytestCheckHook , requests +, trustme }: buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.10.1"; + version = "1.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0="; + hash = "sha256-doGgo9BHAStb3A7jfX+PB+vnarCMrsz8OSHOI8iNW8Y="; }; propagatedBuildInputs = [ @@ -25,17 +24,9 @@ buildPythonPackage rec { nativeCheckInputs = [ betamax - mock + pyopenssl pytestCheckHook - ]; - - disabledTests = [ - # https://github.com/requests/toolbelt/issues/306 - "test_no_content_length_header" - "test_read_file" - "test_reads_file_from_url_wrapper" - "test_x509_der" - "test_x509_pem" + trustme ]; pythonImportsCheck = [ @@ -45,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolbelt of useful classes and functions to be used with requests"; homepage = "http://toolbelt.rtfd.org"; + changelog = "https://github.com/requests/toolbelt/blob/${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index d938fb1f219c6..0c34a24d0864c 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.21"; + version = "0.17.32"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + hash = "sha256-7JOQY3YZFOFFQpcqXLptM8I7CFmrY0L2HPBwz8YA78I="; }; # Tests use relative paths @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml/"; + changelog = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 9054cb14d2784..055d5ff857283 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -7,6 +7,7 @@ , numpy , fixtures , networkx +, testtools , libiconv , stdenv , lib @@ -37,12 +38,12 @@ buildPythonPackage rec { buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ fixtures networkx ]; + checkInputs = [ fixtures networkx testtools ]; pythonImportsCheck = [ "rustworkx" ]; meta = with lib; { - description = "A high performance Python graph library implemented in Rust."; + description = "A high performance Python graph library implemented in Rust"; homepage = "https://github.com/Qiskit/rustworkx"; license = licenses.asl20; maintainers = with maintainers; [ raitobezarius ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index c45a729164673..ab2d25c2b50f7 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.173.0"; + version = "2.175.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs="; + hash = "sha256-7wITaGTHazC34bUF78ZFXFQYz48g1fZlPE8jvIBvE9w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 197f508002284..c9402b30b125e 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sanic-routing"; - version = "22.8.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-routing"; rev = "refs/tags/v${version}"; - hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY="; + hash = "sha256-ual/vjL3M/nqlaRttJPoBcOYE3L/OAahbBLceUEVLXc="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index acb174c86997b..8ebdeef2c86f7 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "22.12.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - hash = "sha256-pFTF2SQ9giRzPhG24FLqLPJRXaFdQ7Xi5EeltS7J3DI="; + hash = "sha256-WDiEuve9P9fLHxpK0UjxhbZUmWXtP+DV7e6OT19TASs="; }; outputs = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index eaa14240191b4..0ca77392079e2 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,30 +1,41 @@ { lib , stdenv -, aiofiles -, beautifulsoup4 , buildPythonPackage -, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works , fetchFromGitHub -, gunicorn + +# build-system +, setuptools + +# propagates +, aiofiles +, html5tagger , httptools , multidict -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonAtLeast , sanic-routing -, sanic-testing -, setuptools +, tracerite +, typing-extensions , ujson -, uvicorn , uvloop , websockets + +# optionals , aioquic + +# tests +, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works + +, beautifulsoup4 +, gunicorn +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sanic-testing +, uvicorn }: buildPythonPackage rec { pname = "sanic"; - version = "22.12.0"; + version = "23.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,7 +44,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8="; + hash = "sha256-Ffw92mlYNV+ikb6299uw24EI1XPpl3Ju2st1Yt/YHKw="; }; nativeBuildInputs = [ @@ -42,15 +53,26 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles - aioquic httptools + html5tagger multidict sanic-routing + tracerite + typing-extensions ujson uvloop websockets ]; + passthru.optional-dependencies = { + ext = [ + # TODO: sanic-ext + ]; + http3 = [ + aioquic + ]; + }; + nativeCheckInputs = [ beautifulsoup4 gunicorn @@ -58,7 +80,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ]; + ] ++ passthru.optional-dependencies.http3; inherit doCheck; @@ -112,6 +134,8 @@ buildPythonPackage rec { disabledTestPaths = [ # We are not interested in benchmarks "benchmark/" + # We are also not interested in typing + "typing/test_typing.py" # unable to create async loop "test_app.py" "test_asgi.py" diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index f7a2c7e1b5474..5b868bb42a6fc 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,34 +1,37 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling , distro , packaging -, python , setuptools -, setuptools-scm , wheel +, tomli # Test Inputs , cmake , cython -, flake8 -, ninja +, git , path , pytestCheckHook , pytest-mock -, pytest-virtualenv , requests -, six , virtualenv }: buildPythonPackage rec { pname = "scikit-build"; - version = "0.16.7"; + version = "0.17.6"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; - hash = "sha256-qbnMdHm3HmyNQ0WW363gJSU6riOtsiqaLYWFD9Uc7P0="; + pname = "scikit_build"; + inherit version; + hash = "sha256-tRpRo2s3xCZQmUtQR5EvWbIuMhCyPjIfKHYR+e9uXJ0="; }; # This line in the filterwarnings section of the pytest configuration leads to this error: @@ -37,24 +40,28 @@ buildPythonPackage rec { sed -i "/'error',/d" pyproject.toml ''; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ distro packaging setuptools - setuptools-scm wheel + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ cmake cython - ninja - path + git pytestCheckHook pytest-mock - pytest-virtualenv requests - six virtualenv ]; @@ -76,13 +83,10 @@ buildPythonPackage rec { "test_hello_sdist" "test_manifest_in_sdist" "test_sdist_with_symlinks" - # distutils.errors.DistutilsArgError: no commands supplied - "test_invalid_command" - "test_manifest_in_sdist" - "test_no_command" ]; meta = with lib; { + changelog = "https://github.com/scikit-build/scikit-build/blob/${version}/CHANGES.rst"; description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; homepage = "https://github.com/scikit-build/scikit-build"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index bd2a9be69b67f..fa2510b0a441c 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; + hash = "sha256-i+VJiG9e2kZDa25VWw5Ic7TxCqIcB99FxLwXNa+8zXo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 1090e724a7fd3..d51c049589ee6 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,9 +1,14 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub +, fetchpatch +, fetchurl +, writeText , python , pythonOlder , buildPythonPackage +, pypaBuildHook +, pipInstallHook , cython , gfortran , meson-python @@ -17,31 +22,77 @@ , pybind11 , pooch , libxcrypt +, xsimd +, blas +, lapack }: -buildPythonPackage rec { +let pname = "scipy"; - version = "1.10.1"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-LPnfuAp7RYm6TEDOdYiYbW1c68VFfK0sKID2vC1C86U="; + # DON'T UPDATE THESE ATTRIBUTES MANUALLY - USE: + # + # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy + # + # Even if you do update these hashes manually, don't change their base + # (base16 or base64), because the update script uses sed regexes to replace + # them with the updated hashes. + version = "1.11.1"; + srcHash = "sha256-bgnYXe3EhzL7+Gfriz1cXCl2eYQJ8zF+rcIwHyZR8bQ="; + datasetsHashes = { + ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; + ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; + face = "11i8x29h80y7hhyqhil1fg8mxag5f827g33lhnsf44qk116hp2wx"; + }; + datasets = lib.mapAttrs ( + d: hash: fetchurl { + url = "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat"; + sha256 = hash; + } + ) datasetsHashes; + # Additional cross compilation related properties that scipy reads in scipy/meson.build + crossFileScipy = writeText "cross-file-scipy.conf" '' + [properties] + numpy-include-dir = '${numpy}/${python.sitePackages}/numpy/core/include' + pythran-include-dir = '${pythran}/${python.sitePackages}/pythran' + host-python-path = '${python.interpreter}' + host-python-version = '${python.pythonVersion}' + ''; +in buildPythonPackage { + inherit pname version; + format = "other"; + + src = fetchFromGitHub { + owner = "scipy"; + repo = pname; + rev = "v${version}"; + hash = srcHash; + fetchSubmodules = true; }; patches = [ - # These tests require internet connection, currently impossible to disable - # them otherwise, see: - # https://github.com/scipy/scipy/pull/17965 - ./disable-datasets-tests.patch + # Helps with cross compilation, see https://github.com/scipy/scipy/pull/18167 + (fetchpatch { + url = "https://github.com/scipy/scipy/commit/dd50ac9d98dbb70625333a23e3a90e493228e3be.patch"; + hash = "sha256-Vf6/hhwu6X5s8KWhq8bUZKtSkdVu/GtEpGtj8Olxe7s="; + excludes = [ + "doc/source/dev/contributor/meson_advanced.rst" + ]; + }) ]; - nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" + ''; + + nativeBuildInputs = [ pypaBuildHook pipInstallHook cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ - numpy.blas + blas + lapack pybind11 pooch + xsimd ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; @@ -53,9 +104,29 @@ buildPythonPackage rec { doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + # Relax deps a bit + substituteInPlace pyproject.toml \ + --replace 'numpy==' 'numpy>=' + # Helps parallelization a bit export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; + # We download manually the datasets and this variable tells the pooch + # library where these files are cached. See also: + # https://github.com/scipy/scipy/pull/18518#issuecomment-1562350648 And at: + # https://github.com/scipy/scipy/pull/17965#issuecomment-1560759962 + export XDG_CACHE_HOME=$PWD; export HOME=$(mktemp -d); mkdir scipy-data + '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList (d: dpath: + # Actually copy the datasets + "cp ${dpath} scipy-data/${d}.dat" + ) datasets)); + + mesonFlags = [ + "-Dblas=${blas.pname}" + "-Dlapack=${lapack.pname}" + # We always run what's necessary for cross compilation, which is passing to + # meson the proper cross compilation related arguments. See also: + # https://docs.scipy.org/doc/scipy/building/cross_compilation.html + "--cross-file=${crossFileScipy}" + ]; # disable stackprotector on aarch64-darwin for now # @@ -71,7 +142,7 @@ buildPythonPackage rec { runHook preCheck pushd "$out" export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy; scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES)" + ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES) != True)" popd runHook postCheck ''; @@ -79,17 +150,23 @@ buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time passthru = { - blas = numpy.blas; + inherit blas; + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" python.pkgs.scipy).file + ] + # Pass it the names of the datasets to update their hashes + ++ (builtins.attrNames datasetsHashes) + ; }; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - SCIPY_USE_G77_ABI_WRAPPER = 1; meta = with lib; { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; - maintainers = [ maintainers.fridh ]; + maintainers = with maintainers; [ fridh doronbehar ]; }; } diff --git a/pkgs/development/python-modules/scipy/disable-datasets-tests.patch b/pkgs/development/python-modules/scipy/disable-datasets-tests.patch deleted file mode 100644 index a06d0d50ddf42..0000000000000 --- a/pkgs/development/python-modules/scipy/disable-datasets-tests.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git i/scipy/datasets/meson.build w/scipy/datasets/meson.build -index 101377253..eec2feea4 100644 ---- i/scipy/datasets/meson.build -+++ w/scipy/datasets/meson.build -@@ -11,4 +11,3 @@ py3.install_sources( - subdir: 'scipy/datasets' - ) - --subdir('tests') diff --git a/pkgs/development/python-modules/scipy/update.sh b/pkgs/development/python-modules/scipy/update.sh new file mode 100755 index 0000000000000..b0d6e2da4f41d --- /dev/null +++ b/pkgs/development/python-modules/scipy/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch-github + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift +datasets="$@" +echoerr datasets are: "$@" +latest_release=$(curl --silent https://api.github.com/repos/scipy/scipy/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-) +# Update version, if needed +if grep -q 'version = "'$version $fname; then + echo "Current version $version is the latest available, will update only datasets' hashes (don't take long)" +else + echoerr got version $version + sed -i -E 's/(version = ).*=/\1'$version'/g' $fname + # Update srcHash + srcHash='"sha256-'$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .sha256)'"' + sed -i 's/srcHash = .*=";/srcHash = '$srcHash';/g' $fname +fi + +for d in $datasets; do + datasetHash=$(nix-prefetch-url "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat") + sed -i 's/'$d' = "[0-9a-z]\+/'$d' = "'$datasetHash'/g' $fname + echoerr updated hash for dataset "'$d'" +done diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 63c0779393133..53fa54a5aff09 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -3,42 +3,56 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling , idna , pyasn1 , pyasn1-modules -, six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "service-identity"; - version = "21.1.0"; + version = "23.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pyca"; repo = pname; - rev = version; - hash = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; + rev = "refs/tags/${version}"; + hash = "sha256-PGDtsDgRwh7GuuM4OuExiy8L4i3Foo+OD0wMrndPkvo="; }; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ attrs cryptography idna pyasn1 pyasn1-modules - six ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "service_identity" ]; + pythonImportsCheck = [ + "service_identity" + ]; meta = with lib; { description = "Service identity verification for pyOpenSSL"; homepage = "https://service-identity.readthedocs.io"; + changelog = "https://github.com/pyca/service-identity/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 906d6355e9b86..e71d8bc78dc04 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.5.2"; + version = "1.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2NrMsU3A6uG2tus+zveWdb03tAZTafecNTk91cVWUsc="; + hash = "sha256-yG5zTerDMFl5mL+8CNpFGH5rJ4N+I72R6tsyBzI5ImI="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 26479aacdad92..6f05b7324c829 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68="; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview4 ]; + buildInputs = [ gtk3 gtksourceview4 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ nest-asyncio diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index f02f82adf1aba..42b225aa3819e 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -36,7 +36,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # broke after aiohttp 3.8.5 upgrade + "test_client_stop_no_wait" + ] ++ lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index fbf000d21e1ee..3e1c35292d227 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -1,6 +1,7 @@ { lib , asn1crypto , buildPythonPackage +, pythonRelaxDepsHook , certifi , cffi , charset-normalizer @@ -31,11 +32,14 @@ buildPythonPackage rec { hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "charset_normalizer>=2,<3" "charset_normalizer" \ - --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" - ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "pyOpenSSL" + "charset-normalizer" + "cryptography" + ]; propagatedBuildInputs = [ asn1crypto diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 88d8d66cda5f4..aca87f3c893c5 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.22"; + version = "1.23.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-cfyi1e7psDQgTkxoarILTY9euUCTliFryubIfDjhjqY="; + hash = "sha256-XUTimWYzza2kmbbSeklt3528ld0fDwn3s3lAJJ5h9uk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5ef2756061858..2f5f5d1a8e2c2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.18"; + version = "2.0.19"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-juZIFlmgwGFFhv+3DsMx6k1QRcGLQyTOwR5Hii8A68c="; + hash = "sha256-97q04wQVtlV2b6VJHxvnQ9ep76T5umn1KI3hXh6a8kU="; }; nativeBuildInputs =[ diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 035329a978157..9e0284d118194 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.18"; + version = "2.17.22"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1pWSP+s1jjtuRWWoPD5CcYZzt9JSiGHPNxxkLXP+pkc="; + hash = "sha256-PQI6r2DoarswjTc8jp+nrJqkmckQ6+eGuI0MU8kvnM8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a135f31578c1d..a88e21021e419 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.11.1"; + version = "1.12"; src = fetchPypi { inherit pname version; - hash = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; + hash = "sha256-6/WVyNrD4P3EFSxRh4tJg5bsfzDnqRTWBx5nTUlCD7g="; }; nativeCheckInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 8e119142bb8b2..8705f64817e8e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -30,6 +30,14 @@ buildPythonPackage rec { hash = "sha256-NPP6I2bOILGPHfVzp3wdJzBs4fKkHZ+e/2IbUZLqh4g="; }; + patches = [ + (fetchpatch { + name = "numpy-1.25-compatibility.patch"; + url = "https://github.com/PyTables/PyTables/commit/337792561e5924124efd20d6fea6bbbd2428b2aa.patch"; + hash = "sha256-pz3A/jTPWXXlzr+Yl5PRUvdSAinebFsoExfek4RUHkc="; + }) + ]; + nativeBuildInputs = [ blosc2 cython diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index c3a56f5c64cac..655f6b8eb1073 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.4.12"; + version = "2023.7.18"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-L6mfmJDKq5GdkyoKyqnQ9YQ9wu81lOISljky4gcTut0="; + hash = "sha256-WlpiSy96t/N+nsQXSuLfGAW5ZY+JAT+bS1VQZy9l8qE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 861560c2aee09..605291edda0b5 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,28 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, enum34 -, functools32, typing ? null + +# build-system +, poetry-core + +# tests , pytestCheckHook -, pyaml +, pyyaml }: buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.6"; + version = "0.12.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; + hash = "sha256-OOH/jtuZEnPsn2GBJEpqORrDDp9QmOdTVkDqa+l6fIY="; }; - propagatedBuildInputs = - lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional isPy27 typing; + nativeBuildInputs = [ + poetry-core + ]; nativeCheckInputs = [ - pyaml + pyyaml pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index b732988db39df..b468e499f52ab 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -49,6 +49,12 @@ buildPythonPackage rec { sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ="; }) + (fetchpatch { + name = "test-new-cryptography.patch"; + url = "https://github.com/tpm2-software/tpm2-pytss/commit/e4006e6066c015d9ed55befa9b98247fbdcafd7d.diff"; + sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas="; + }) + # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch ]; diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix new file mode 100644 index 0000000000000..e94e8a8d1d95b --- /dev/null +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, html5tagger +, python +}: + +buildPythonPackage rec { + pname = "tracerite"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "tracerite"; + rev = "v${version}"; + hash = "sha256-At8wVR3EcHEi051BBfjb+sOhs93GyzWlEAjtehTMeNU="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + html5tagger + ]; + + postInstall = '' + cp tracerite/style.css $out/${python.sitePackages}/tracerite + ''; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "tracerite" + ]; + + meta = with lib; { + description = "Tracebacks for Humans (in Jupyter notebooks"; + homepage = "https://github.com/sanic-org/tracerite"; + license = licenses.unlicense; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index e3f6f5e7bfb0b..aa37946026f95 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -1,13 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, pytest -, mock -, ipython_genutils -, decorator +, pytestCheckHook , pythonOlder -, six , hatchling }: @@ -23,16 +18,12 @@ buildPythonPackage rec { }; nativeBuildInputs = [ hatchling ]; - nativeCheckInputs = [ glibcLocales pytest mock ]; - propagatedBuildInputs = [ ipython_genutils decorator six ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" py.test - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Traitlets Python config system"; - homepage = "https://ipython.org/"; + homepage = "https://github.com/ipython/traitlets"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 911ab5a777b77..7cd0dd7ca8a53 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -6,33 +6,45 @@ , pythonOlder }: -buildPythonPackage rec { - pname = "trove-classifiers"; - version = "2023.7.6"; - format = "setuptools"; +let + self = buildPythonPackage rec { + pname = "trove-classifiers"; + version = "2023.7.6"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; - }; + src = fetchPypi { + inherit pname version; + hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"calver"' "" + ''; + + nativeBuildInputs = [ + calver + ]; + + doCheck = false; # avoid infinite recursion with hatchling - nativeBuildInputs = [ - calver - ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + pythonImportsCheck = [ "trove_classifiers" ]; - pythonImportsCheck = [ "trove_classifiers" ]; + passthru.tests.trove-classifiers = self.overridePythonAttrs { doCheck = true; }; - meta = { - description = "Canonical source for classifiers on PyPI"; - homepage = "https://github.com/pypa/trove-classifiers"; - changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + meta = { + description = "Canonical source for classifiers on PyPI"; + homepage = "https://github.com/pypa/trove-classifiers"; + changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 7b12ef05facc5..582a9e0f56364 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -111,6 +111,7 @@ buildPythonPackage rec { echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'WrapClientTLSParserTests.test_tls.skip = "pyopenssl update"' >> src/twisted/internet/test/test_endpoints.py echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index de6512b3e41bc..72302723c855c 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.5.0"; + version = "4.7.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-XLX0p5E51plgez72IqHe2vqE4RWrACTg2cBEqUecp8s="; + hash = "sha256-t13cJk8LpWFdt7ohfa65lwGtKVNTxF+elZYzN87u/7I="; }; nativeBuildInputs = [ @@ -32,7 +32,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Backported and Experimental Type Hints for Python 3.5+"; + description = "Backported and Experimental Type Hints for Python"; + changelog = "https://github.com/python/typing_extensions/blob/${version}/CHANGELOG.md"; homepage = "https://github.com/python/typing"; license = licenses.psfl; maintainers = with maintainers; [ pmiddend ]; diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index a5d27c1f71bbf..59eb745547882 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit version; pname = "typing_inspect"; - hash = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; + hash = "sha256-sj/EL/b272lU5IUsH7USzdGNvqAxNPkfhWqVzMlGH3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 392e8e8992409..5b32b4343a055 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools +, wheel , pytz-deprecation-shim , pytest-mock , pytestCheckHook @@ -10,15 +12,22 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.2"; # version needs to be compatible with APScheduler + version = "4.3"; # version needs to be compatible with APScheduler - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7"; + hash = "sha256-PyHQnhsqqfLazKEtokDKN947pSN6k63f1tWTr+kHM1U="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ pytz-deprecation-shim ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 2573bdc51ece2..b93552c4e07f1 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.24.1"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.5"; - # Fetching from GitHub as Pypi contains different versions src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; rev = "v${version}"; - hash = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; fetchSubmodules = true; + hash = "sha256-CZp+/5fG5IBawnIZLeO9lXke8rodqRcSf+ofyF584mc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +43,6 @@ buildPythonPackage rec { description = "Streamlined Cython bindings for the harfbuzz shaping engine"; homepage = "https://github.com/harfbuzz/uharfbuzz"; license = licenses.asl20; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index cd7496d636d04..13ef39be76db9 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.14"; + version = "1.26.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-B2kHv4/TVc3ndyhHExZiWk0vfnE8El9RlTu1s+7PT3I="; + hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; }; # FIXME: remove backwards compatbility hack diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 2f61e8847ac66..d8369260587e3 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "usort"; - version = "1.1.0b2"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "facebook"; repo = "usort"; rev = "refs/tags/v${version}"; - hash = "sha256-c3gQ+f/BRgM+Nwc+mEP7dcmig7ws7FqL5zwQhNJJlsI="; + hash = "sha256-emnrghdsUs+VfvYiJExG13SKQNrXAEtGNAJQLScADnw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index e48536e66359d..9baa150afb712 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.20.0"; - disabled = pythonOlder "3.7"; + version = "0.23.1"; + disabled = pythonOlder "3.8"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng="; + hash = "sha256-X/G6K0X4G1EsMIBpvqy62zZ++8paTHNqgYLi+B7YK+0="; }; outputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click h11 - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index 4ada58e1d992b..805e8df1c710c 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -1,12 +1,10 @@ { stdenv , buildPythonPackage -, asgiref +, a2wsgi , uvicorn , httpx -, pytest-asyncio , pytestCheckHook , pytest-mock -, requests , trustme , watchgod , wsproto @@ -23,16 +21,14 @@ buildPythonPackage { dontInstall = true; nativeCheckInputs = [ - asgiref uvicorn httpx pytestCheckHook - pytest-asyncio pytest-mock - requests trustme # strictly optional dependencies + a2wsgi watchgod wsproto ] diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 2f562a02ffdd1..40c4b0b1fc985 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -1,34 +1,41 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, decorator -, six +, fetchFromGitHub +, poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "validators"; - version = "0.20.0"; - disabled = isPy27; + version = "0.21.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-JBSM5OZBAKLV4mcjPiPnr+tVMWtH0w+q5+tucpK8Imo="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "python-validators"; + repo = "validators"; + rev = "refs/tags/${version}"; + hash = "sha256-b5K1WP+cEAjPBXu9sAZQf1J5H7PLnn94400Zd/0Y9ew="; }; - propagatedBuildInputs = [ - decorator - six + nativeBuildInputs = [ + poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "validators" + ]; + meta = with lib; { - description = "Python Data Validation for Humans™"; + description = "Python Data Validation for Humans"; homepage = "https://github.com/kvesteri/validators"; + changelog = "https://github.com/python-validators/validators/blob/${version}/CHANGES.md"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch deleted file mode 100644 index 2b34da289e2db..0000000000000 --- a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 21563405d6e2348ee457187f7fb61beb102bb367 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Sun, 24 May 2020 09:33:13 +0200 -Subject: [PATCH] Check base_prefix and base_exec_prefix for Python 2 - -This is a Nixpkgs-specific change so it can support virtualenvs from Nix envs. ---- - src/virtualenv/discovery/py_info.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py -index 6f12128..74e9218 100644 ---- a/src/virtualenv/discovery/py_info.py -+++ b/src/virtualenv/discovery/py_info.py -@@ -51,13 +51,17 @@ class PythonInfo(object): - self.version = u(sys.version) - self.os = u(os.name) - -+ config_vars = {} if sys.version_info.major is not 2 else sysconfig._CONFIG_VARS -+ base_prefix = config_vars.get("prefix") -+ base_exec_prefix = config_vars.get("exec_prefix") -+ - # information about the prefix - determines python home - self.prefix = u(abs_path(getattr(sys, "prefix", None))) # prefix we think -- self.base_prefix = u(abs_path(getattr(sys, "base_prefix", None))) # venv -+ self.base_prefix = u(abs_path(getattr(sys, "base_prefix", base_prefix))) # venv - self.real_prefix = u(abs_path(getattr(sys, "real_prefix", None))) # old virtualenv - - # information about the exec prefix - dynamic stdlib modules -- self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", None))) -+ self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", base_exec_prefix))) - self.exec_prefix = u(abs_path(getattr(sys, "exec_prefix", None))) - - self.executable = u(abs_path(sys.executable)) # the executable we were invoked via --- -2.25.1 - diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 28100b8c55e7a..10602bfd4f3af 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -11,24 +11,24 @@ , hatch-vcs , hatchling , importlib-metadata -, importlib-resources , platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook +, time-machine }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.19.0"; + version = "20.24.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N6ZAuoLtQLImWZxSLUEeS+XtszmgwN4DDA3HtkbWFZA="; + hash = "sha256-4qfO+dqIDWk7kz23ZUNndU8U4gZQ3GDo7nOFVx+Fk6M="; }; nativeBuildInputs = [ @@ -40,16 +40,10 @@ buildPythonPackage rec { distlib filelock platformdirs - ] ++ lib.optionals (pythonOlder "3.7") [ - importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - patches = lib.optionals (isPy27) [ - ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch - ]; - nativeCheckInputs = [ cython flaky @@ -57,6 +51,8 @@ buildPythonPackage rec { pytest-mock pytest-timeout pytestCheckHook + ] ++ lib.optionals (!isPyPy) [ + time-machine ]; preCheck = '' @@ -91,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}"; + changelog = "https://github.com/pypa/virtualenv/blob/${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index c01464f27ceb7..54c30dabc7811 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,19 +24,20 @@ buildPythonPackage rec { pname = "wagtail"; - version = "4.2.2"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8="; + hash = "sha256-3r0h34el2zRF1l/94S7xTjBqJPWtSQFQvtVW8Mjq0rs="; }; postPatch = '' substituteInPlace setup.py \ - --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" + --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ + --replace "Pillow>=4.0.0,<10.0.0" "Pillow>=9.1.0,<11.0.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 8fc5fe72aca71..3e56109bcbe31 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.21.0"; + version = "3.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7JSsVUiDx2XpTaiylHxPD6SgN47Tu+nzZT3zpbF0Wm0="; + hash = "sha256-r/Yb0/XXTfIKYjKEQ+OqnIYNUzD9+xnE2N3ETLYEAy8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; postPatch = '' substituteInPlace setup.cfg \ - --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2" \ + --replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \ --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" ''; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index d4d297d68d4d8..f7030f7c874eb 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -2,22 +2,29 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six -, pillow + +# dependencies +, filetype +, defusedxml, }: buildPythonPackage rec { pname = "willow"; - version = "1.4.1"; + version = "1.5.1"; + format = "setuptools"; + disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - hash = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; + hash = "sha256-t6SQkRATP9seIodZLgZzzCVeAobhzVNCfuaN8ckiDEw="; }; - propagatedBuildInputs = [ six pillow ]; + propagatedBuildInputs = [ + filetype + defusedxml + ]; # Test data is not included # https://github.com/torchbox/Willow/issues/34 diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index e700f630b665a..bf8b03aa09691 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.2.0"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc="; + hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 552a1333e8fbd..0f27248c688c8 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.14.2"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aOxZuOvfxP7l4yvWwM4nP3L31O0BdFS0UyfGc8YJB7w="; + hash = "sha256-hONraVvaDs6lKvmGEnGYTLIqXIZGeZB7e5uj95toT34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index b16248fb9fc05..1b033810b5b48 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.15.0"; + version = "3.16.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ESkprWSdqUHCPeUPNWorVXDJVLZRUGQrzN1mvxlNIks="; + hash = "sha256-68FZRqp4vWNFiZL8gew7b3sektUcNebeHDgE5zt5kUc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/python2-modules/bootstrapped-pip/default.nix index 2fc8b8b8d4b79..314bf0048c8a6 100644 --- a/pkgs/development/python2-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python2-modules/bootstrapped-pip/default.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation rec { mv pip* pip mv setuptools* setuptools mv wheel* wheel - # Set up PYTHONPATH. The above folders need to be on PYTHONPATH - # $out is where we are installing to and takes precedence - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH" + # Set up PYTHONPATH: + # - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip. + # - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip. + export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH" echo "Building setuptools wheel..." pushd setuptools diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ce50ab2882e30..029329723fc0b 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -239,9 +239,9 @@ in }; gio2 = attrs: { - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index a91500e149480..32b7ba5a17844 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -46,9 +46,8 @@ python3.pkgs.buildPythonApplication rec { --replace 'boto3>=' 'boto3>=1.26.79 #' \ --replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \ --replace 'docker~=6.1.0' 'docker~=6.0.1' \ - --replace 'pyopenssl~=23.2.0' 'pyopenssl~=23.1.0' \ --replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \ - --replace 'tomlkit==0.11.8' 'tomlkit~=0.11.6' \ + --replace 'tomlkit==0.11.8' 'tomlkit>=0.11.8' \ --replace 'typing_extensions~=4.4.0' 'typing_extensions~=4.4' \ --replace 'tzlocal==3.0' 'tzlocal>=3.0' \ --replace 'watchdog==' 'watchdog>=2.1.2 #' diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 31714db5c8931..f46e9667cbef2 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pythonOlder , setuptools +, testtools }: buildPythonApplication rec { @@ -30,6 +31,7 @@ buildPythonApplication rec { fixtures mock pytestCheckHook + testtools ]; pythonImportsCheck = [ "bashate" ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 7370aee6f575a..9ea57a27f0272 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -19,6 +19,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-+ohUOQ9WBER/X0TDklf/qZCm9LhM1I1QRmED4FnkweM="; }; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = with python3.pkgs; [ bottle colorama @@ -41,6 +45,11 @@ python3.pkgs.buildPythonApplication rec { pyopenssl ]; + pythonRelaxDeps = [ + # This can be removed once conan is updated to 2.0.7+ + "PyYAML" + ]; + nativeCheckInputs = [ git pkg-config diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 868889648486d..3082ec2bd7986 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.21.0"; + version = "0.23.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - hash = "sha256-7cXnV27LCG1MXDH28UBmUC4sLooH2gKvGYF3YijLB38="; + hash = "sha256-gPFG1AgInakF8leMM0c1zZt2OdZdIKcUmItwICV8p1I="; }; propagatedBuildInputs = [ @@ -29,16 +29,6 @@ buildPythonApplication rec { responses ]; - pytestFlagsArray = [ - # DeprecationWarning: Accessing jsonschema.draft3_format_checker is deprecated and will be removed in a future release. Instead, use the FORMAT_CHECKER attribute on the corresponding Validator. - "-W" "ignore::DeprecationWarning" - ]; - - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''; - pythonImportsCheck = [ "check_jsonschema" "check_jsonschema.cli" diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix new file mode 100644 index 0000000000000..5736d301b32d4 --- /dev/null +++ b/pkgs/development/tools/dt-schema/default.nix @@ -0,0 +1,30 @@ +{ lib +, python3 +}: + +let python = python3.override { + packageOverrides = self: super: { + # see https://github.com/devicetree-org/dt-schema/issues/108 + jsonschema = super.jsonschema.overridePythonAttrs (old: rec { + version = "4.17.3"; + disabled = self.pythonOlder "3.7"; + + src = old.src.override { + inherit version; + hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; + }; + + propagatedBuildInputs = with self; ([ + attrs + pyrsistent + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + pkgutil-resolve-name + ]); + }); + }; +}; in python.pkgs.toPythonApplication python.pkgs.dtschema + diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index f6760d5938a69..c145504015c25 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.6.3"; + version = "1.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZQ5nG6MAMY5Jjvk7vjuZsyzhSSB2T7h1P4mZP2Pu15o="; + hash = "sha256-evxwH9WzNoSmZQ4eyriVfhloX4JCQLp0WNys1m+Q+0Y="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -61,17 +61,24 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" - # Formatting changes with pygments 2.14.0 - "test_create_necessary_directories" + # tomlkit 0.12 changes + "test_no_strict_naming" + "test_project_location_basic_set_first_project" + "test_project_location_complex_set_first_project" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" + + # This test assumes it is running on macOS with a system shell on the PATH. + # It is not possible to run it in a nix build using a /nix/store shell. + # See https://github.com/pypa/hatch/pull/709 for the relevant code. + "test_populate_default_popen_kwargs_executable" ]; meta = with lib; { description = "Modern, extensible Python project manager"; homepage = "https://hatch.pypa.io/latest/"; - changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history.md#hatch"; + changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history/hatch.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index f3a44d51a85d9..a28d4774c12cd 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.40.0"; + version = "0.40.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - hash = "sha256-UGIqrdjIP7AyLck1DT38wS48hSn46uZXcMrSehXOui8="; + hash = "sha256-xj5WKAduaJWA3NhWuMsF5EXF91+NTGAXkbdhpeFqLxE="; }; vendorHash = null; @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne equirosa paveloom ]; + mainProgram = "lazygit"; }; } diff --git a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix index f0ba4aae74d58..fc48fc83374b9 100644 --- a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix +++ b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix @@ -15,6 +15,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-5TAw5H3soxe9vLhfj1qs8uMr4ybrHlCj4zdsMzvPo6s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'Pillow = "^' 'Pillow = ">=' + ''; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 56e6662b7c5f8..960c889e6b64f 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -7,23 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-RRMT//OnwzoZEsOPZyHfQQbkphopZBI1u8xQe8LsPBo="; + hash = "sha256-3ncaO7B3e4F2LFj1IjHvOyoWXBYQM69vPfPnsBr+tKI="; }; - cargoHash = "sha256-o9L6GUYDDm/WM8iD0k/OGf26w9O8DLH0jMr//ruKnrs="; + cargoHash = "sha256-EjifSABhowk3PSQTuAm8+xRYbc0OwdqHMb9o/z1yuP0="; - buildNoDefaultFeatures = true; - buildFeatures = [ - "default-optimizations" - ] ++ lib.optionals withSimd [ - "simd" - ]; + buildNoDefaultFeatures = !withSimd; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 09a955f965d9f..311be4ccdc29a 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "sha256-ovwmltu97fzNQT0oZHefrAo4yV9HV1NwcY4PTSM5Bro="; + sha256 = "sha256-7zZdLby7HdNoURgdkg+xnlp6VDCACcyGCTtjM43OLd4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index fbf281634609c..e11baa783ba69 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ requests + testtools ]; pythonImportsCheck = [ "pifpaf" ]; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index a3fb8ea57c671..4f5418ea4faca 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -8,20 +8,21 @@ , CoreFoundation , libiconv , Security +, rav1e }: rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.9.20"; + version = "0.9.22"; src = fetchCrate { inherit pname; # this version may need to be updated along with package version - version = "${version}+cargo-0.71"; - hash = "sha256-T0/gqzeJxDSZDoi8tl4vgYEAFbJDlCoxuqoi6rnf5U4="; + version = "${version}+cargo-0.72"; + hash = "sha256-B9y8/8qms+t6LnUFes4/MGcEp8P8C2hunCouiTMt0LY="; }; - cargoHash = "sha256-tArfCEGFRgJPERZW1HzfdDedc+FD8bpc+LX4wNwdv6Q="; + cargoHash = "sha256-7amH8qPmi531sDy3aZsZ5J/oSCnbHY47YzsFODDPcBU="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ @@ -40,6 +41,10 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; + passthru.tests = { + inherit rav1e; + }; + meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatible dynamic and static libraries"; longDescription = '' diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 0705235d85752..10a4849de8f78 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "assert_cmd", @@ -5321,7 +5321,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "clap", @@ -5338,7 +5338,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -5367,7 +5367,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.22.0" +version = "0.23.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5379,7 +5379,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -5428,7 +5428,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.22.0" +version = "0.23.0" dependencies = [ "hyper", "shuttle-common", @@ -5437,7 +5437,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -5480,6 +5480,7 @@ dependencies = [ "tracing", "tracing-opentelemetry", "tracing-subscriber", + "ulid", "utoipa", "utoipa-swagger-ui", "uuid", @@ -5487,7 +5488,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -5536,6 +5537,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "ttl_cache", + "ulid", "utoipa", "utoipa-swagger-ui", "uuid", @@ -5544,13 +5546,14 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "chrono", "home", "prost", "prost-types", + "serde_json", "shuttle-common", "tokio", "tonic", @@ -5561,7 +5564,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.22.0" +version = "0.23.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5587,7 +5590,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.22.0" +version = "0.23.0" dependencies = [ "async-trait", "chrono", @@ -5611,7 +5614,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -5644,7 +5647,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -6898,6 +6901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" dependencies = [ "rand", + "serde", ] [[package]] diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index fb5061349ae8c..af45ab606de78 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-mHmeNKr9Q/wIHO2G8xVOJTSr5myIzhXWl6R+SLEbDN8="; + hash = "sha256-WRmqejTx1nR5Ov2av/f8yRoexVzJGYbfEf+y8pvH/oY="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index eb2bf54f299b3..6542dacbe9e75 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -3,8 +3,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, pkg-config -, dbus , libiconv , Security }: @@ -22,10 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ dbus ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; # Requires network access, fails in sandbox. doCheck = false; diff --git a/pkgs/development/web/boa/default.nix b/pkgs/development/web/boa/default.nix index de7b41ad4a28b..dffc94934868b 100644 --- a/pkgs/development/web/boa/default.nix +++ b/pkgs/development/web/boa/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , bzip2 , openssl @@ -21,6 +22,14 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "fix-rust-1.71-lints.patch"; + url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch"; + hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ="; + }) + ]; + cargoHash = "sha256-2ZzTvVoA4oxy26rL0tvdvXm2oVWpHP+gooyjB4vIP3M="; cargoBuildFlags = [ "--package" "boa_cli" ]; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 130545b8d9735..572f00a49a083 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.16.1"; - sha256 = "sha256-6EBPjI2J/f336Vu7xgZr0OVxrLpY9USSWZthX77v4nI="; + version = "18.17.0"; + sha256 = "01h4fzr0dpnhmd96hxhbb8dhyylp68j5ramrrh9w4fgaynnzmh40"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index b21cdadac1e0b..28e2a58b0d008 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -15,11 +15,11 @@ buildPythonApplication { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 4b674ac129dfd..77eab7918b91c 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -21,10 +21,9 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 - gobject-introspection ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix index b502b4f1396d9..193d4dc0b585f 100644 --- a/pkgs/games/jumpnbump/default.nix +++ b/pkgs/games/jumpnbump/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 gobject-introspection ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook gobject-introspection ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 ]; postInstall = '' make -C menu PREFIX=$out all install diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 6ea0291764827..79585e74a0954 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -39,8 +39,14 @@ stdenv.mkDerivation rec { --replace "/usr/bin/file" "${file}/bin/file" ''; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; meta = with lib; { description = "Free touch typing tutor program"; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index a8e883acae37b..3009eb0b9a089 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -100,8 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ]; - buildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems gobject-introspection ]; sourceRoot = "."; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 3071142fc9245..7e91b69d700f1 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "13.3"; + version = "13.4"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-qvoW0vtnFlE0xzqIj3n3pe19oXoEz26ez2csnLiecZI="; + hash = "sha256-Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 46fe0ab60ac47..da113ed1afc2d 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,14 +2,20 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.54.1"; + version = "0.54.4"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-MfYh2a3wjWB/5zgTE8AAIREI2OEhykqF0Rad7I+912U="; + hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; + + meta = { + homepage = "https://github.com/JGRennison/OpenTTD-patches"; + changelog = "https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp-${version}/jgrpp-changelog.md"; + }; + }) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 7c85da21f7f39..7d5b622eaa813 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, eigen, celt +, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies , aften, AudioUnit, CoreAudio, libobjc, Accelerate @@ -46,9 +46,8 @@ stdenv.mkDerivation (finalAttrs: { aften AudioUnit CoreAudio Accelerate libobjc ]; - prePatch = '' - substituteInPlace svnversion_regenerate.sh \ - --replace /bin/bash ${bash}/bin/bash + postPatch = '' + patchShebangs --build svnversion_regenerate.sh ''; dontAddWafCrossFlags = true; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index fc87290da69ae..90265afc4284e 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -2,7 +2,7 @@ , imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xautolock"; version = "2.2-7-ga23dd5c"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "peti"; repo = "xautolock"; - rev = "v${version}"; - sha256 = "10j61rl0sx9sh84rjyfyddl73xb5i2cpb17fyrli8kwj39nw0v2g"; + rev = "v${finalAttrs.version}"; + hash = "sha256-T2zAbRqSTxRp9u6EdZmIZfVxaGveeZkJgjp1DWgORoI="; }; nativeBuildInputs = [ imake gccmakedep ]; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peti ]; platforms = platforms.linux; license = licenses.gpl2; + mainProgram = "xautolock"; }; -} +}) diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index b05d973bb3d32..7650dcdc8c704 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -63,6 +63,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( MIG = "mig"; MIGCOM = "migcom"; STRIP = "${stdenv.cc.bintools.targetPrefix or ""}strip"; + RANLIB = "${stdenv.cc.bintools.targetPrefix or ""}ranlib"; NM = "${stdenv.cc.bintools.targetPrefix or ""}nm"; UNIFDEF = "unifdef"; DSYMUTIL = "dsymutil"; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 4446ed005028c..237b6db65b026 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Backlight and Keyboard LED control tool"; homepage = "https://gitlab.com/cameronnemo/brillo"; + mainProgram = "brillo"; license = [ licenses.gpl3 licenses.bsd0 ]; platforms = platforms.linux; maintainers = [ maintainers.alexarice ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index fc7da8fe9baa5..c19646ac529a7 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM="; + sha256 = "sha256-LrbGyXK+lYm6tzMnW/AgvrX2RNX5Q5c3kg5wGvbPNIU="; }; # vlock is moved into its own output, since it depends on pam. This diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index abe797f74b250..5d1c1cfc89c04 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ ]; license = lib.licenses.gpl2Plus; + pkgConfigModules = [ "libselinux" ]; }; } diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 2049b7cf0e70a..144533621b750 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation rec { cp -a out/public-include/smbios_c $out/include/ ''; - preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs + # remove forbidden reference to $TMPDIR + preFixup = '' + patchelf --shrink-rpath --allowed-rpath-prefixes "/nix/store" "$out/sbin/smbios-sys-info-lite" + ''; meta = with lib; { homepage = "https://github.com/dell/libsmbios"; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 895e84f827b45..9b37b7c7e63e9 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -48,7 +48,10 @@ stdenv.mkDerivation rec { # Making regexp to patch-out installing of .so symlinks from Makefile is # complicated, it is easier to remove them post-install. - postInstall = lib.optionalString stdenv.hostPlatform.isStatic '' + postInstall = '' + mkdir -p $out/share/doc/${pname} + cp -r configs doc/* $out/share/doc/${pname} + '' + lib.optionalString stdenv.hostPlatform.isStatic '' rm $out/lib/*.so* ''; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index 5ef0b0b0ea7f4..ce59cea368b19 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook + gobject-introspection ] ++ lib.optionals withDoc [ sphinx graphviz @@ -81,7 +82,6 @@ stdenv.mkDerivation rec { pcre zstd glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 8772c081e0371..a002e1af8899a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , makeWrapper , pkg-config , rsync @@ -18,15 +17,20 @@ , libgudev , libusb1 , glib -, gobject-introspection , gettext , systemd +, nixosTests , useIMobileDevice ? true , libimobiledevice -, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) -, nixosTests +, withDocs ? withIntrospection +, mesonEmulatorHook +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection }: +assert withDocs -> withIntrospection; + stdenv.mkDerivation (finalAttrs: { pname = "upower"; version = "1.90.2"; @@ -60,14 +64,19 @@ stdenv.mkDerivation (finalAttrs: { meson ninja python3 - gtk-doc docbook-xsl-nons gettext - gobject-introspection libxslt makeWrapper pkg-config rsync + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withDocs [ + gtk-doc + ] ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -110,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dudevhwdbdir=${placeholder "out"}/lib/udev/hwdb.d" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "auto" else "disabled"}" - "-Dgtk-doc=${lib.boolToString withDocs}" + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonBool "gtk-doc" withDocs) "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9a335010c872f..e69ec1fb324da 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -138,6 +138,13 @@ stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ]; platforms = platforms.unix; + pkgConfigModules = [ + "blkid" + "fdisk" + "mount" + "smartcols" + "uuid" + ]; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages }; } diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 702676dfc942d..09a1b5e83da2e 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -48,10 +48,15 @@ with python.pkgs; buildPythonApplication rec { sourceRoot = "${src.name}/backend"; postPatch = '' + # use input files to not depend on outdated peer dependencies + mv requirements/base.{in,txt} + mv requirements/dev.{in,txt} + # remove dependency constraints - sed 's/[~<>=].*//' -i requirements/base.in requirements/base.txt - sed 's/zope-interface/zope.interface/' -i requirements/base.in requirements/base.txt - sed 's/\[standard\]//' -i requirements/base.in requirements/base.txt + sed -i requirements/base.txt \ + -e 's/[~<>=].*//' -i requirements/base.txt \ + -e 's/zope-interface/zope.interface/' \ + -e 's/\[standard\]//' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 4bd159f2c7e44..5d604885edcf0 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.4"; + version = "2.7.3"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; + hash = "sha256-fQhujBYyl2p3cdqyf+LVebPBGxXn2lKMB/dsvTo5+NM="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0="; + hash = "sha256-KezKMpx3M7rdKXEWf5XUSXqY5SEimACkv3OB/4XccCE="; }; - vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM="; + vendorHash = "sha256-mTHEM+0yakKiy4ZFi+2qakjSlKFyRkbjeXOXdvx+9lA="; subPackages = [ "cmd/caddy" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 16e712d074fdc..4c8435836313c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -28,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.5.9"; + version = "23.3.8.21"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -36,7 +36,7 @@ in mkDerivation rec { rev = "v${version}-lts"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM="; + hash = "sha256-bynr196H6g/GmvNTtrfB6QDdAScvYvbe7EIceoOwCKc="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix index 1a25e77388054..fa2517b9ba2a1 100644 --- a/pkgs/servers/eris-go/default.nix +++ b/pkgs/servers/eris-go/default.nix @@ -1,27 +1,26 @@ -{ lib, stdenv, buildGoModule, fetchFromGitea }: +{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }: buildGoModule rec { pname = "eris-go"; - version = "20230202"; + version = "20230729"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; - repo = pname; + repo = "eris-go"; rev = version; - hash = "sha256-o9FRlUtMk1h8sR+am2gNEQOMgAceRTdRusI4a6ikHUM="; + hash = "sha256-yFWmfWmlGL4fC36XsjO/ao/v8FVI20EpXSblZ0EcosI="; }; - vendorHash = "sha256-ZDJm7ZlDBVWLnuC90pOwa608GnuEgy0N/I96vvesZPY="; + vendorHash = "sha256-Z6rirsiiBzH0herQAkxZp1Xr++489qNoiD4fqoLt9/A="; - postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; - # eris-get is a multicall binary + passthru.tests = { inherit (nixosTests) eris-server; }; meta = src.meta // { description = "Implementation of ERIS for Go"; + homepage = "https://codeberg.org/eris/eris-go"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; - mainProgram = "eris-get"; broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix index a892a38c3b495..edea448ee84e1 100644 --- a/pkgs/servers/etcd/3.3.nix +++ b/pkgs/servers/etcd/3.3.nix @@ -28,7 +28,7 @@ buildGoPackage rec { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline zowoq ]; + maintainers = with maintainers; [ offline ]; broken = stdenv.isDarwin; # outdated golang.org/x/sys knownVulnerabilities = [ "CVE-2023-32082" ]; }; diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index f2efeb15c94ea..61b3f99d01471 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -29,6 +29,6 @@ buildGoModule rec { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline zowoq ]; + maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index 2bee123b9a870..a7507f1dd2377 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -16,7 +16,7 @@ let description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline zowoq endocrimes ]; + maintainers = with maintainers; [ offline endocrimes ]; platforms = platforms.darwin ++ platforms.linux; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9c074cf090cc7..ad390836d707a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -449,6 +449,10 @@ in python.pkgs.buildPythonApplication rec { "--deselect tests/test_config.py::test_merge" # AssertionError: assert 2 == 1 "--deselect=tests/helpers/test_translation.py::test_caching" + # AssertionError: assert None == RegistryEntry + "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" + # AssertionError: assert 2 == 1 + "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 30d9ae748f1c1..4981198779401 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -690,8 +690,8 @@ let self = { name = "set-misc"; owner = "openresty"; repo = "set-misc-nginx-module"; - rev = "v0.32"; - sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax"; + rev = "v0.33"; + hash = "sha256-jMMj3Ki1uSfQzagoB/O4NarxPjiaF9YRwjSKo+cgMxo="; }; meta = with lib; { diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index e1f41f2f6b6b9..3eecd652ada36 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -3,8 +3,8 @@ , withPython3 ? true, python3, ncurses , withPHP81 ? true, php81 , withPHP82 ? false, php82 -, withPerl534 ? false, perl534 -, withPerl536 ? true, perl536 +, withPerl536 ? false, perl536 +, withPerl538 ? true, perl538 , withPerldevel ? false, perldevel , withRuby_3_0 ? false, ruby_3_0 , withRuby_3_1 ? true, ruby_3_1 @@ -46,8 +46,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP81 php81-unit ++ optional withPHP82 php82-unit - ++ optional withPerl534 perl534 ++ optional withPerl536 perl536 + ++ optional withPerl538 perl538 ++ optional withPerldevel perldevel ++ optional withRuby_3_0 ruby_3_0 ++ optional withRuby_3_1 ruby_3_1 @@ -70,8 +70,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} - ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} + ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 88dacb73986da..10cafd2019c7e 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -14,9 +14,9 @@ buildGoModule rec { vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ gobject-introspection vips ] + buildInputs = [ vips ] ++ lib.optionals stdenv.isDarwin [ libunwind ]; preBuild = '' diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix index fe1f2469ef2de..c15c24681a2c4 100644 --- a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix @@ -29,13 +29,8 @@ buildPythonPackage rec { maturinBuildHook ]); - preBuild = '' - cd synapse - ''; + buildAndTestSubdir = "synapse"; - postBuild = '' - cd .. - ''; pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ]; diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index e140eac00748d..a043d22aa9784 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -11,7 +11,7 @@ py.toPythonApplication py.mysqlclient ]; - postPatch = '' + postPatch = (old.postPatch or "") + '' substituteInPlace mlflow/utils/process.py --replace \ "child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," \ "cmd[0]='$out/bin/gunicornMlflow'; child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 7225f8d11e583..aafbc2d1e5a44 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.20"; + version = "2.9.21"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-RRWn1xPvYkDL+81/JOAW+K8I2ezq+z65KiJPYMrF7Sw="; + hash = "sha256-gzwnD9o0lqo1lUw9viSnvjsWSCSmMi2qR9ndtWztMjQ="; }; - vendorHash = "sha256-INzCHNr469LajEggVpVZ0Kj0zpe7GwX26af2C/7zx7o="; + vendorHash = "sha256-RK5OD1zea4M4/mXjGKhU+igSoE4YaA2/jAL7RFBoouo="; doCheck = false; diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix index ea9654a878dce..16b2ca404246d 100644 --- a/pkgs/servers/nosql/janusgraph/default.nix +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { makeWrapper ${jdk11}/bin/java $out/bin/janusgraph-server \ --add-flags "-classpath $classpath org.janusgraph.graphdb.server.JanusGraphServer" + + # temporary workaround for + # https://github.com/NixOS/nixpkgs/pull/244400#issuecomment-1667330430 + cd "$TMPDIR" ''; meta = with lib; { diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index bc164c9b963a2..4ae1b0d13b6f3 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -117,10 +117,13 @@ stdenv.mkDerivation { cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen ''; - # Avoid references to $TMPDIR by removing it and let patchelf cleanup the - # binaries. + # remove forbidden references to $TMPDIR preFixup = '' - rm -rf "$(pwd)" && mkdir "$(pwd)" + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done ''; meta = with lib; { diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index b7b4e3c4ee6ea..2da905e1ffd33 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,28 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yttOaDsWcRCFBzziOW4H1Nrs7/X/pGFlnPNUQRf+w8="; + sha256 = "sha256-Kk9SDGDTCq1qHew9yrf1HmYAhse5mB4AqH/Oo/lc0dc="; }; - cargoHash = "sha256-8lv0AGcV4LW6r+K0rIZNV0NPhX4j3+wbMw4JeJkNuXw="; + cargoHash = "sha256-6YTdOb1JvP5yTD1FVpHGG3C+hgiuTUiy05s+e3k8cdI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - # Some tests need network + dontUseCargoParallelTests = true; + checkFlags = [ + # requires internet access "--skip=paste::tests::test_paste_data" - "--skip=server::tests::test_index_with_landing_page_file_not_found" - "--skip=server::tests::test_upload_file" "--skip=server::tests::test_upload_remote_file" - "--skip=util::tests::test_get_expired_files" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index ef59c5415500e..5d60e53748405 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -8,7 +8,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", @@ -45,7 +45,7 @@ dependencies = [ "actix-utils", "actix-web", "askama_escape", - "bitflags", + "bitflags 1.3.2", "bytes", "derive_more", "futures-core", @@ -70,7 +70,7 @@ dependencies = [ "actix-utils", "ahash 0.7.6", "base64 0.21.0", - "bitflags", + "bitflags 1.3.2", "brotli", "bytes", "bytestring", @@ -94,7 +94,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd", + "zstd 0.12.2+zstd.1.5.2", ] [[package]] @@ -212,7 +212,7 @@ dependencies = [ "pin-project-lite", "tokio-rustls 0.23.4", "tokio-util", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -317,6 +317,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -341,9 +352,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -435,13 +446,13 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "api" -version = "1.3.2" +version = "1.4.0" dependencies = [ "chrono", "env_logger", @@ -522,13 +533,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -582,7 +593,7 @@ checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -629,7 +640,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object", "rustc-demangle", ] @@ -647,6 +658,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -661,7 +678,7 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -673,7 +690,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -698,6 +715,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -783,6 +806,16 @@ dependencies = [ ] [[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] name = "bzip2-sys" version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -809,6 +842,15 @@ dependencies = [ ] [[package]] +name = "cedarwood" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90" +dependencies = [ + "smallvec", +] + +[[package]] name = "cexpr" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -837,6 +879,31 @@ dependencies = [ ] [[package]] +name = "charabia" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57aa1b4a8dda126c03ebf2f7e31d16cfc8781c2fe80dedd1a33459efc3e07578" +dependencies = [ + "aho-corasick", + "cow-utils", + "csv", + "deunicode", + "either", + "fst", + "irg-kvariants", + "jieba-rs", + "lindera-core", + "lindera-dictionary", + "lindera-tokenizer", + "once_cell", + "pinyin", + "serde", + "slice-group-by", + "unicode-normalization", + "whatlang", +] + +[[package]] name = "chrono" version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -889,6 +956,16 @@ dependencies = [ ] [[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 = "clang-sys" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -901,9 +978,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -912,9 +989,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -924,14 +1001,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -960,6 +1037,7 @@ dependencies = [ "async-trait", "atomicwrites", "chrono", + "common", "criterion", "env_logger", "fs_extra", @@ -1013,6 +1091,13 @@ dependencies = [ ] [[package]] +name = "common" +version = "0.1.0" +dependencies = [ + "serde", +] + +[[package]] name = "config" version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1118,6 +1203,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] +name = "cow-utils" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" + +[[package]] name = "cpp_demangle" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1255,6 +1346,27 @@ dependencies = [ ] [[package]] +name = "csv" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] name = "cxx" version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1356,6 +1468,12 @@ dependencies = [ ] [[package]] +name = "deunicode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" + +[[package]] name = "digest" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1363,6 +1481,7 @@ checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -1401,9 +1520,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1412,15 +1531,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + +[[package]] name = "env_logger" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1477,12 +1669,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "filetime" @@ -1516,12 +1705,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1569,6 +1758,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3" [[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + +[[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1630,7 +1825,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1703,9 +1898,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" dependencies = [ "earcutr", "float_next_after", @@ -1719,9 +1914,9 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.9" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f0b3068e1537a4b861ec3734f4aa9c317d537cf0845bf6fb6221973499d26c" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" dependencies = [ "approx", "num-traits", @@ -1799,9 +1994,9 @@ checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" @@ -1847,10 +2042,16 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "hashring" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0ddd025eccd8a2fff9865e82ef4c8ce00c4a67709036847d95cf3ccffd07a8" +checksum = "c499ff70b6f65833dd5961abe0464eb295ec69993ba3ab0066f42be4fbb98b85" dependencies = [ "siphasher", ] @@ -1909,6 +2110,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2056,7 +2266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -2092,6 +2302,15 @@ dependencies = [ ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2123,7 +2342,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7b36074613a723279637061b40db993208908a94f10ccb14436ce735bc0f57" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -2134,6 +2353,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] +name = "irg-kvariants" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78" +dependencies = [ + "csv", + "once_cell", + "serde", +] + +[[package]] name = "is-terminal" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2170,6 +2400,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] +name = "jieba-rs" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +dependencies = [ + "cedarwood", + "fxhash", + "hashbrown 0.14.0", + "lazy_static", + "phf", + "phf_codegen", + "regex", +] + +[[package]] name = "jobserver" version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2264,6 +2509,215 @@ dependencies = [ ] [[package]] +name = "lindera-cc-cedict-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] +name = "lindera-compress" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" +dependencies = [ + "anyhow", + "flate2", + "lindera-decompress", +] + +[[package]] +name = "lindera-core" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "encoding_rs", + "log", + "once_cell", + "serde", + "thiserror", + "yada", +] + +[[package]] +name = "lindera-decompress" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" +dependencies = [ + "anyhow", + "flate2", + "serde", +] + +[[package]] +name = "lindera-dictionary" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-ipadic-builder", + "lindera-ipadic-neologd-builder", + "lindera-ko-dic", + "lindera-ko-dic-builder", + "lindera-unidic", + "lindera-unidic-builder", + "serde", +] + +[[package]] +name = "lindera-ipadic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "serde", + "yada", +] + +[[package]] +name = "lindera-ipadic-neologd-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "serde", + "yada", +] + +[[package]] +name = "lindera-ko-dic" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "flate2", + "lindera-core", + "lindera-decompress", + "lindera-ko-dic-builder", + "once_cell", + "tar", +] + +[[package]] +name = "lindera-ko-dic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] +name = "lindera-tokenizer" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-dictionary", + "once_cell", + "serde", + "serde_json", +] + +[[package]] +name = "lindera-unidic" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "lindera-core", + "lindera-decompress", + "lindera-unidic-builder", + "once_cell", + "ureq", + "zip", +] + +[[package]] +name = "lindera-unidic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] name = "link-cplusplus" version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2297,6 +2751,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] name = "local-channel" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2446,6 +2906,15 @@ dependencies = [ ] [[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] name = "mio" version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2476,7 +2945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] @@ -2487,7 +2956,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "static_assertions", @@ -2536,7 +3005,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2551,9 +3020,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2586,9 +3055,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -2621,7 +3090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -2663,6 +3132,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" [[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "paste" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2675,6 +3155,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2751,6 +3243,44 @@ dependencies = [ ] [[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "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 0.8.5", +] + +[[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.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2783,6 +3313,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pinyin" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd12336e3afa34152e002f57df37a7056778daa59ea542b3473b87f5fb260c4" + +[[package]] name = "pkg-config" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2824,9 +3360,9 @@ checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" [[package]] name = "pprof" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b90f8560ad8bd57b207b8293bc5226e48e89039a6e590c12a297d91b84c7e60" +checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" dependencies = [ "backtrace", "cfg-if", @@ -2870,7 +3406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2912,7 +3448,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "hex", "lazy_static", @@ -2940,14 +3476,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.6.28", "rusty-fork", "tempfile", "unarray", @@ -3019,7 +3555,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb3c02f54ecaf12572c1a60dbdb36b1f8f713a16105881143f2be84cca5bbe3" dependencies = [ - "bitflags", + "bitflags 1.3.2", "proc-macro2", "prost-build", "quote", @@ -3028,7 +3564,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.3.2" +version = "1.4.0" dependencies = [ "actix-cors", "actix-files", @@ -3091,7 +3627,7 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#c93556cbeca5373e742286200490ec213d0de06e" +source = "git+https://github.com/qdrant/quantization.git#c4d7db0935b2fd6cbde179c5e65f57e9493e993f" dependencies = [ "cc", "permutation_iterator", @@ -3276,7 +3812,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3285,18 +3821,18 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] [[package]] @@ -3305,7 +3841,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.28", ] [[package]] @@ -3315,6 +3851,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "relative-path" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" + +[[package]] name = "reqwest" version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3351,7 +3899,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.22.6", "winreg", ] @@ -3392,9 +3940,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -3403,9 +3951,9 @@ dependencies = [ [[package]] name = "robust" -version = "0.2.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" [[package]] name = "rocksdb" @@ -3424,15 +3972,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "serde", ] [[package]] name = "rstar" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" dependencies = [ "heapless", "num-traits", @@ -3441,9 +3989,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +checksum = "2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c" dependencies = [ "futures", "futures-timer", @@ -3453,15 +4001,18 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" +checksum = "225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03" dependencies = [ "cfg-if", + "glob", "proc-macro2", "quote", + "regex", + "relative-path", "rustc_version", - "syn 1.0.107", + "syn 2.0.28", "unicode-ident", ] @@ -3502,7 +4053,7 @@ version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.2.8", "io-lifetimes 0.7.5", "libc", @@ -3516,7 +4067,7 @@ version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.3.1", "io-lifetimes 1.0.11", "libc", @@ -3530,7 +4081,7 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.3.1", "io-lifetimes 1.0.11", "libc", @@ -3539,6 +4090,19 @@ dependencies = [ ] [[package]] +name = "rustix" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +dependencies = [ + "bitflags 2.3.3", + "errno 0.3.1", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys 0.48.0", +] + +[[package]] name = "rustls" version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3731,7 +4295,9 @@ dependencies = [ "bincode", "bitvec", "cgroups-rs", + "charabia", "chrono", + "common", "criterion", "fs_extra", "futures", @@ -3754,6 +4320,7 @@ dependencies = [ "rayon", "rmp-serde", "rocksdb", + "rstest", "schemars", "seahash", "semver", @@ -3773,15 +4340,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.168" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af" +checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" dependencies = [ "serde_derive", ] @@ -3808,13 +4375,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.168" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -3830,9 +4397,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -3935,6 +4502,12 @@ dependencies = [ ] [[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + +[[package]] name = "slog" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4024,6 +4597,7 @@ dependencies = [ "parking_lot", "proptest", "prost", + "protobuf", "raft", "rand 0.8.5", "reqwest", @@ -4056,6 +4630,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] name = "symbolic-common" version = "12.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4091,9 +4671,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -4118,9 +4698,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.4" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4139,9 +4719,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ "filetime", "libc", @@ -4150,15 +4730,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.19", + "rustix 0.38.3", "windows-sys 0.48.0", ] @@ -4183,22 +4762,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4235,9 +4814,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -4345,7 +4924,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4641,6 +5220,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64 0.21.0", + "log", + "once_cell", + "rustls 0.21.0", + "rustls-webpki", + "url", + "webpki-roots 0.23.1", +] + +[[package]] name = "url" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4660,9 +5254,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.8", "serde", @@ -4752,7 +5346,7 @@ dependencies = [ "memmap2 0.7.1", "rand 0.8.5", "rand_distr", - "rustix 0.37.19", + "rustix 0.38.3", "serde", ] @@ -4903,6 +5497,25 @@ dependencies = [ ] [[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] + +[[package]] +name = "whatlang" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" +dependencies = [ + "hashbrown 0.12.3", + "once_cell", +] + +[[package]] name = "which" version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5128,6 +5741,12 @@ dependencies = [ ] [[package]] +name = "yada" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1" + +[[package]] name = "yaml-rust" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5137,12 +5756,51 @@ dependencies = [ ] [[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq 0.1.5", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.17", + "zstd 0.11.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] name = "zstd" version = "0.12.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" dependencies = [ - "zstd-safe", + "zstd-safe 6.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", ] [[package]] diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 792662cd722be..bc98872429d38 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -11,30 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UKGpbI5XjS0s9Aedos8FX7J1zcbsAgLY1zS3M0DSf9s="; + sha256 = "sha256-ccvtDz6woANSotTn6GwTAbGd0UlrpddvfH8+GR1dI3g="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-ZPz2vVRA81SZ1xK1d4iiTU54xnr8zGaUzKXIZKGTZOc="; + "quantization-0.1.0" = "sha256-pV+lfO0LV/+jOV+v/oQADsde6a8XKNah0OVJdTnzdvw="; "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; "wal-0.1.2" = "sha256-sMleBUAZcSnUx7/oQZr9lSDmVHxUjfGaVodvVtFEle0="; }; }; - prePatch = lib.optionalString stdenv.isAarch64 '' - substituteInPlace .cargo/config.toml \ - --replace "[target.aarch64-unknown-linux-gnu]" "" \ - --replace "linker = \"aarch64-linux-gnu-gcc\"" "" - ''; - # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 4a98e2a436e1f..f561eec0bac8f 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -5,14 +5,14 @@ , lib , makeWrapper , monkeysAudio -, perl534Packages +, perlPackages , sox , stdenv , wavpack , zlib }: -perl534Packages.buildPerlPackage rec { +perlPackages.buildPerlPackage rec { pname = "slimserver"; version = "8.3.1"; @@ -25,7 +25,7 @@ perl534Packages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl534Packages.CryptOpenSSLRSA perl534Packages.IOSocketSSL ]; + buildInputs = [ perlPackages.CryptOpenSSLRSA perlPackages.IOSocketSSL ]; prePatch = '' rm -rf Bin diff --git a/pkgs/servers/sql/sqld/Cargo.lock b/pkgs/servers/sql/sqld/Cargo.lock new file mode 100644 index 0000000000000..d9b8c1f5f9b99 --- /dev/null +++ b/pkgs/servers/sql/sqld/Cargo.lock @@ -0,0 +1,5268 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" + +[[package]] +name = "ambient-authority" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal 0.4.7", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "arbitrary" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "autotools" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77" +dependencies = [ + "cc", +] + +[[package]] +name = "aws-config" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sdk-sso", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes 1.4.0", + "fastrand", + "hex", + "http", + "hyper", + "ring", + "time 0.3.22", + "tokio", + "tower", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "fastrand", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-endpoint" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-http" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "bytes 1.4.0", + "http", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-s3" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-client", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes 1.4.0", + "http", + "http-body", + "once_cell", + "percent-encoding", + "regex", + "tokio-stream", + "tower", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes 1.4.0", + "http", + "regex", + "tokio-stream", + "tower", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes 1.4.0", + "http", + "regex", + "tower", + "tracing", +] + +[[package]] +name = "aws-sig-auth" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-types", + "http", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-http", + "bytes 1.4.0", + "form_urlencoded", + "hex", + "hmac", + "http", + "once_cell", + "percent-encoding", + "regex", + "sha2", + "time 0.3.22", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes 1.4.0", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-client" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-types", + "bytes 1.4.0", + "fastrand", + "http", + "http-body", + "hyper", + "hyper-rustls 0.23.2", + "lazy_static", + "pin-project-lite", + "rustls 0.20.8", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" +dependencies = [ + "aws-smithy-types", + "bytes 1.4.0", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-types", + "bytes 1.4.0", + "bytes-utils", + "futures-core", + "http", + "http-body", + "hyper", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "aws-smithy-http-tower" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes 1.4.0", + "http", + "http-body", + "pin-project-lite", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-types" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +dependencies = [ + "base64-simd", + "itoa", + "num-integer", + "ryu", + "time 0.3.22", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-types", + "http", + "rustc_version", + "tracing", +] + +[[package]] +name = "axum" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes 1.4.0", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes 1.4.0", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "prettyplease 0.2.9", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.22", +] + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[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 = "bottomless" +version = "0.1.18" +dependencies = [ + "anyhow", + "arc-swap", + "async-compression", + "aws-config", + "aws-sdk-s3", + "bytes 1.4.0", + "chrono", + "crc", + "futures", + "rand", + "sqld-libsql-bindings", + "tokio", + "tokio-util", + "tracing", + "tracing-subscriber", + "uuid", +] + +[[package]] +name = "bottomless-cli" +version = "0.1.14" +dependencies = [ + "anyhow", + "aws-config", + "aws-sdk-s3", + "aws-smithy-types", + "bottomless", + "chrono", + "clap", + "tokio", + "tracing", + "tracing-subscriber", + "uuid", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] + +[[package]] +name = "bytes-utils" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +dependencies = [ + "bytes 1.4.0", + "either", +] + +[[package]] +name = "bytesize" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" + +[[package]] +name = "cap-fs-ext" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b0e103ce36d217d568903ad27b14ec2238ecb5d65bad2e756a8f3c0d651506e" +dependencies = [ + "cap-primitives", + "cap-std", + "io-lifetimes 0.7.5", + "windows-sys 0.36.1", +] + +[[package]] +name = "cap-primitives" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3f336aa91cce16033ed3c94ac91d98956c49b420e6d6cd0dd7d0e386a57085" +dependencies = [ + "ambient-authority", + "fs-set-times", + "io-extras", + "io-lifetimes 0.7.5", + "ipnet", + "maybe-owned", + "rustix 0.35.13", + "winapi-util", + "windows-sys 0.36.1", + "winx", +] + +[[package]] +name = "cap-rand" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d14b9606aa9550d34651bc481443203bc014237bdb992d201d2afa62d2ec6dea" +dependencies = [ + "ambient-authority", + "rand", +] + +[[package]] +name = "cap-std" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d6e70b626eceac9d6fc790fe2d72cc3f2f7bc3c35f467690c54a526b0f56db" +dependencies = [ + "cap-primitives", + "io-extras", + "io-lifetimes 0.7.5", + "ipnet", + "rustix 0.35.13", +] + +[[package]] +name = "cap-time-ext" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a0524f7c4cff2ea547ae2b652bf7a348fd3e48f76556dc928d8b45ab2f1d50" +dependencies = [ + "cap-primitives", + "once_cell", + "rustix 0.35.13", + "winx", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "console-api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +dependencies = [ + "prost", + "prost-types", + "tonic 0.9.2", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures", + "hdrhistogram", + "humantime", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic 0.9.2", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "containers-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef94b0ff8338282b35bafb408eb0a3e53ba05bdb3b36840589ab9a67a6682593" +dependencies = [ + "chrono", + "flate2", + "futures-util", + "http", + "hyper", + "hyperlocal", + "log", + "mime", + "paste", + "pin-project 1.1.0", + "serde", + "serde_json", + "tar", + "thiserror", + "tokio", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpp_demangle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cpufeatures" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +dependencies = [ + "libc", +] + +[[package]] +name = "cranelift-bforest" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62c772976416112fa4484cbd688cb6fb35fd430005c1c586224fc014018abad" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b40ed2dd13c2ac7e24f88a3090c68ad3414eb1d066a95f8f1f7b3b819cb4e46" +dependencies = [ + "arrayvec", + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-egraph", + "cranelift-entity", + "cranelift-isle", + "gimli", + "log", + "regalloc2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb927a8f1c27c34ee3759b6b0ffa528d2330405d5cc4511f0cab33fe2279f4b5" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dfa417b884a9ab488d95fd6b93b25e959321fe7bfd7a0a960ba5d7fb7ab927" + +[[package]] +name = "cranelift-egraph" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce" +dependencies = [ + "cranelift-entity", + "fxhash", + "hashbrown 0.12.3", + "indexmap 1.9.3", + "log", + "smallvec", +] + +[[package]] +name = "cranelift-entity" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0637ffde963cb5d759bc4d454cfa364b6509e6c74cdaa21298add0ed9276f346" +dependencies = [ + "serde", +] + +[[package]] +name = "cranelift-frontend" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb72b8342685e850cb037350418f62cc4fc55d6c2eb9c7ca01b82f9f1a6f3d56" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850579cb9e4b448f7c301f1e6e6cbad99abe3f1f1d878a4994cb66e33c6db8cd" + +[[package]] +name = "cranelift-native" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a279e5bcba3e0466c734d8d8eb6bfc1ad29e95c37f3e4955b492b5616335e" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b8c5e7ffb754093fb89ec4bd4f9dbb9f1c955427299e334917d284745835c2" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools", + "log", + "smallvec", + "wasmparser", + "wasmtime-types", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "crc32c" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "derive_arbitrary" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "enclose" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1056f553da426e9c025a662efa48b52e62e0a3a7648aa2d15aeaaf7f0d329357" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "end-to-end" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "hyper", + "insta", + "octopod", + "reqwest", + "serde_json", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal 0.4.7", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "file-per-thread-logger" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fn-error-context" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-set-times" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" +dependencies = [ + "io-lifetimes 0.7.5", + "rustix 0.35.13", + "windows-sys 0.36.1", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "futures_codec" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" +dependencies = [ + "bytes 0.5.6", + "futures", + "memchr", + "pin-project 0.4.30", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghost" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +dependencies = [ + "fallible-iterator", + "indexmap 1.9.3", + "stable_deref_trait", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes 1.4.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +dependencies = [ + "base64 0.13.1", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes 1.4.0", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.4.0", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes 1.4.0", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +dependencies = [ + "http", + "hyper", + "log", + "rustls 0.20.8", + "rustls-native-certs", + "tokio", + "tokio-rustls 0.23.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls 0.21.2", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.4.0", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tungstenite" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226df6fd0aece319a325419d770aa9d947defa60463f142cd82b329121f906a3" +dependencies = [ + "hyper", + "pin-project 1.1.0", + "tokio", + "tokio-tungstenite", + "tungstenite", +] + +[[package]] +name = "hyperlocal" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" +dependencies = [ + "futures-util", + "hex", + "hyper", + "pin-project 1.1.0", + "tokio", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "insta" +version = "1.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" +dependencies = [ + "ghost", +] + +[[package]] +name = "io-extras" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" +dependencies = [ + "io-lifetimes 0.7.5", + "windows-sys 0.36.1", +] + +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 0.7.5", + "rustix 0.35.13", + "windows-sys 0.36.1", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes 1.0.11", + "rustix 0.37.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "ittapi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e648c437172ce7d3ac35ca11a068755072054826fa455a916b43524fa4a62a7" +dependencies = [ + "anyhow", + "ittapi-sys", + "log", +] + +[[package]] +name = "ittapi-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b32a4d23f72548178dde54f3c12c6b6a08598e25575c0d0fa5bd861e0dc1a5" +dependencies = [ + "cc", +] + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +dependencies = [ + "base64 0.21.2", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libsql-client" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7b1c078b4d3d45ba0db91accc23dcb8d2761d67f819efd94293065597b7ac8" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.21.2", + "num-traits", + "reqwest", + "serde_json", + "url", +] + +[[package]] +name = "libsql-wasmtime-bindings" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb56f5849df5085e99b7e1bea2e87ff3f93c4143d0922ab43682f904d9cbf59" +dependencies = [ + "wasmtime", + "wasmtime-wasi", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "git+https://github.com/psarna/rusqlite?rev=477264453b#477264453b3a254bce04ad9b27c4777eee73467c" +dependencies = [ + "bindgen", + "cc", + "libsql-wasmtime-bindings", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "maybe-owned" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memfd" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +dependencies = [ + "rustix 0.37.20", +] + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +dependencies = [ + "libmimalloc-sys", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "crc32fast", + "hashbrown 0.12.3", + "indexmap 1.9.3", + "memchr", +] + +[[package]] +name = "octopod" +version = "0.1.0" +source = "git+https://github.com/MarinPostma/octopod.git?rev=68c24e3#68c24e3f65a5d39fe412274e34cc016c264a7639" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "inventory", + "maplit", + "octopod-macros", + "podman-api", + "reqwest", + "termion", + "tokio", + "tokio-stream", + "uuid", +] + +[[package]] +name = "octopod-macros" +version = "0.1.0" +source = "git+https://github.com/MarinPostma/octopod.git?rev=68c24e3#68c24e3f65a5d39fe412274e34cc016c264a7639" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.0", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "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_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", + "uncased", +] + +[[package]] +name = "pin-project" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal 1.1.0", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "podman-api" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d0ade207138f12695cb4be3b590283f1cf764c5c4909f39966c4b4b0dba7c1e" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes 1.4.0", + "chrono", + "containers-api", + "flate2", + "futures-util", + "futures_codec", + "log", + "paste", + "podman-api-stubs", + "serde", + "serde_json", + "tar", + "thiserror", + "tokio", + "url", +] + +[[package]] +name = "podman-api-stubs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d280c623f633a0dded88feab9e387f98451506431d5b7308a858c643305dcee" +dependencies = [ + "chrono", + "serde", + "serde_json", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" +dependencies = [ + "proc-macro2", + "syn 2.0.22", +] + +[[package]] +name = "priority-queue" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" +dependencies = [ + "autocfg", + "indexmap 1.9.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "byteorder", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.6.29", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes 1.4.0", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes 1.4.0", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-src" +version = "1.1.0+21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" +dependencies = [ + "autotools", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +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 = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_termios" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ + "redox_syscall 0.2.16", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regalloc2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes 1.4.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls 0.24.0", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.2", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "git+https://github.com/psarna/rusqlite?rev=477264453b#477264453b3a254bce04ad9b27c4777eee73467c" +dependencies = [ + "bitflags 2.3.3", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.35.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "io-lifetimes 0.7.5", + "itoa", + "libc", + "linux-raw-sys 0.0.46", + "once_cell", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.1", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scram" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7679a5e6b97bac99b2c208894ba0d34b17d9657f0b728c1cd3bf1c5f7f6ebe88" +dependencies = [ + "base64 0.13.1", + "rand", + "ring", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "serde_json" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha256" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a975c1bc0941703000eaf232c4d8ce188d8d5408d6344b6b2c8c6262772828" +dependencies = [ + "hex", + "sha2", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time 0.3.22", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "sqlc" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes 1.4.0", + "fallible-iterator", + "fn-error-context", + "libsql-client", + "scram", + "tokio", + "tracing", + "tracing-subscriber", + "unwrap_or", + "url", +] + +[[package]] +name = "sqld" +version = "0.17.2" +dependencies = [ + "anyhow", + "arbitrary", + "async-lock", + "async-trait", + "aws-config", + "aws-sdk-s3", + "axum", + "base64 0.21.2", + "bincode", + "bottomless", + "bytemuck", + "bytes 1.4.0", + "bytesize", + "clap", + "console-subscriber", + "crc", + "crossbeam", + "enclose", + "env_logger", + "fallible-iterator", + "futures", + "hmac", + "hyper", + "hyper-tungstenite", + "insta", + "itertools", + "jsonwebtoken", + "libsql-client", + "memmap", + "mimalloc", + "nix", + "once_cell", + "parking_lot", + "priority-queue", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "rand", + "regex", + "reqwest", + "rusqlite", + "serde", + "serde_json", + "sha2", + "sha256", + "sqld-libsql-bindings", + "sqlite3-parser", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tonic 0.8.3", + "tonic-build", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "url", + "uuid", + "vergen", +] + +[[package]] +name = "sqld-libsql-bindings" +version = "0.1.0" +dependencies = [ + "anyhow", + "once_cell", + "rusqlite", + "tracing", +] + +[[package]] +name = "sqlite3-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3995a6daa13c113217b6ad22154865fb06f9cb939bef398fd04f4a7aaaf5bd7" +dependencies = [ + "bitflags 2.3.3", + "cc", + "fallible-iterator", + "indexmap 1.9.3", + "log", + "memchr", + "phf", + "phf_codegen", + "phf_shared", + "smallvec", + "uncased", +] + +[[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.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-interface" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92adbaf536f5aff6986e1e62ba36cee72b1718c5153eee08b9e728ddde3f6029" +dependencies = [ + "atty", + "bitflags 1.3.2", + "cap-fs-ext", + "cap-std", + "io-lifetimes 0.7.5", + "rustix 0.35.13", + "windows-sys 0.36.1", + "winx", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix 0.37.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termion" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659c1f379f3408c7e5e84c7d0da6d93404e3800b6b9d063ba24436419302ec90" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + +[[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.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +dependencies = [ + "autocfg", + "bytes 1.4.0", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.8", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.2", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes 1.4.0", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tonic" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.13.1", + "bytes 1.4.0", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project 1.1.0", + "prost", + "prost-derive", + "rustls-pemfile", + "tokio", + "tokio-rustls 0.23.4", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +dependencies = [ + "async-trait", + "axum", + "base64 0.21.2", + "bytes 1.4.0", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project 1.1.0", + "prost", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +dependencies = [ + "prettyplease 0.1.25", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project 1.1.0", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "async-compression", + "bitflags 1.3.2", + "bytes 1.4.0", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project 1.1.0", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +dependencies = [ + "byteorder", + "bytes 1.4.0", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "unwrap_or" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fbfe96089af082b3c856f83bdd0b6866241377d9dbea803fb39481151e5742d" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3c89c2c7e50f33e4d35527e5bf9c11d6d132226dbbd1753f0fbe9f19ef88c6" +dependencies = [ + "anyhow", + "rustversion", + "time 0.3.22", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[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.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi-cap-std-sync" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecbeebb8985a5423f36f976b2f4a0b3c6ce38d7d9a7247e1ce07aa2880e4f29b" +dependencies = [ + "anyhow", + "async-trait", + "cap-fs-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "io-extras", + "io-lifetimes 0.7.5", + "is-terminal 0.3.0", + "once_cell", + "rustix 0.35.13", + "system-interface", + "tracing", + "wasi-common", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasi-common" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81e2171f3783fe6600ee24ff6c58ca1b329c55e458cc1622ecc1fd0427648607" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "cap-rand", + "cap-std", + "io-extras", + "rustix 0.35.13", + "thiserror", + "tracing", + "wasmtime", + "wiggle", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.22", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasmparser" +version = "0.93.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328" +dependencies = [ + "indexmap 1.9.3", +] + +[[package]] +name = "wasmtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18265705b1c49218776577d9f301d79ab06888c7f4a32e2ed24e68a55738ce7" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "cfg-if", + "indexmap 1.9.3", + "libc", + "log", + "object", + "once_cell", + "paste", + "psm", + "rayon", + "serde", + "target-lexicon", + "wasmparser", + "wasmtime-cache", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit", + "wasmtime-runtime", + "wat", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a201583f6c79b96e74dcce748fa44fb2958f474ef13c93f880ea4d3bed31ae4f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-cache" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f37efc6945b08fcb634cffafc438dd299bac55a27c836954656c634d3e63c31" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bincode", + "directories-next", + "file-per-thread-logger", + "log", + "rustix 0.35.13", + "serde", + "sha2", + "toml", + "windows-sys 0.36.1", + "zstd", +] + +[[package]] +name = "wasmtime-cranelift" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe208297e045ea0ee6702be88772ea40f918d55fbd4163981a4699aff034b634" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-environ" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b97f7441ac780a7fa738db5b9c23c1b70ef4abccd8ad205ada5669d196ba2" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli", + "indexmap 1.9.3", + "log", + "object", + "serde", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-fiber" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5f54abc960b4a055ba16b942cbbd1da641e0ad44cc97a7608f3d43c069b120e" +dependencies = [ + "cc", + "cfg-if", + "rustix 0.35.13", + "wasmtime-asm-macros", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-jit" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32800cb6e29faabab7056593f70a4c00c65c75c365aaf05406933f2169d0c22f" +dependencies = [ + "addr2line", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle", + "gimli", + "ittapi", + "log", + "object", + "rustc-demangle", + "serde", + "target-lexicon", + "thiserror", + "wasmtime-environ", + "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe057012a0ba6cee3685af1e923d6e0a6cb9baf15fb3ffa4be3d7f712c7dec42" +dependencies = [ + "object", + "once_cell", + "rustix 0.35.13", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6bbabb309c06cc238ee91b1455b748c45f0bdcab0dda2c2db85b0a1e69fcb66" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-runtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a23b6e138e89594c0189162e524a29e217aec8f9a4e1959a34f74c64e8d17d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap 1.9.3", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.6.5", + "paste", + "rand", + "rustix 0.35.13", + "thiserror", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit-debug", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-types" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ec7615fde8c79737f1345d81f0b18da83b3db929a87b4604f27c932246d1e2" +dependencies = [ + "cranelift-entity", + "serde", + "thiserror", + "wasmparser", +] + +[[package]] +name = "wasmtime-wasi" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca539adf155dca1407aa3656e5661bf2364b1f3ebabc7f0a8bd62629d876acfa" +dependencies = [ + "anyhow", + "wasi-cap-std-sync", + "wasi-common", + "wasmtime", + "wiggle", +] + +[[package]] +name = "wast" +version = "35.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" +dependencies = [ + "leb128", +] + +[[package]] +name = "wast" +version = "60.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad" +dependencies = [ + "leb128", + "memchr", + "unicode-width", + "wasm-encoder", +] + +[[package]] +name = "wat" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b" +dependencies = [ + "wast 60.0.0", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "wiggle" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da09ca5b8bb9278a2123e8c36342166b9aaa55a0dbab18b231f46d6f6ab85bc" +dependencies = [ + "anyhow", + "async-trait", + "bitflags 1.3.2", + "thiserror", + "tracing", + "wasmtime", + "wiggle-macro", +] + +[[package]] +name = "wiggle-generate" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5796f53b429df7d44cfdaae8f6d9cd981d82aec3516561352ca9c5e73ee185" +dependencies = [ + "anyhow", + "heck", + "proc-macro2", + "quote", + "shellexpand", + "syn 1.0.109", + "witx", +] + +[[package]] +name = "wiggle-macro" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b830eb7203d48942fb8bc8bb105f76e7d09c33a082d638e990e02143bb2facd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wiggle-generate", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +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.0", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winx" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" +dependencies = [ + "bitflags 1.3.2", + "io-lifetimes 0.7.5", + "windows-sys 0.36.1", +] + +[[package]] +name = "witx" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" +dependencies = [ + "anyhow", + "log", + "thiserror", + "wast 35.0.2", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xmlparser" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", +] diff --git a/pkgs/servers/sql/sqld/default.nix b/pkgs/servers/sql/sqld/default.nix new file mode 100644 index 0000000000000..2acb0ec4d368b --- /dev/null +++ b/pkgs/servers/sql/sqld/default.nix @@ -0,0 +1,57 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, openssl +, sqlite +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "sqld"; + version = "0.17.2"; + + src = fetchFromGitHub { + owner = "libsql"; + repo = "sqld"; + rev = "v${version}"; + hash = "sha256-KoEscrzkFJnxxJKL/2r4cY0oLpKdQMjFR3daryzrVKQ="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libsqlite3-sys-0.26.0" = "sha256-JzSGpqYtkIq0mVYD0kERIB6rmZUttqkCGne+M4vqTJU="; + "octopod-0.1.0" = "sha256-V16fOlIp9BCpyzgh1Aei3Mra/y15v8dQFA8tHdOwZm4="; + }; + }; + + nativeBuildInputs = [ + pkg-config + protobuf + rustPlatform.bindgenHook + ]; + + buildInputs = [ + openssl + sqlite + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env.ZSTD_SYS_USE_PKG_CONFIG = true; + + # requires a complex setup with podman for the end-to-end tests + doCheck = false; + + meta = { + description = "LibSQL with extended capabilities like HTTP protocol, replication, and more"; + homepage = "https://github.com/libsql/sqld"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 734ced245056e..4b66484f7b27d 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ jdk11 ]; installPhase = '' - mv ../$sourceRoot $out + cp -r ../$sourceRoot $out rm -f $out/bin/*bat rm -rf $out/extensions mkdir -p $out/share/nifi diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index ff4656f6650f3..6bdbd1798e3de 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -8,13 +8,13 @@ , dash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dash"; version = "0.5.12"; src = fetchurl { - url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; + url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz"; + hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; }; strictDeps = true; @@ -31,22 +31,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { - homepage = "http://gondor.apana.org.au/~herbert/dash/"; - description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; - platforms = platforms.unix; - license = with licenses; [ bsd3 gpl2 ]; - }; - passthru = { shellPath = "/bin/dash"; tests = { - "execute-simple-command" = runCommand "${pname}-execute-simple-command" { } '' + "execute-simple-command" = runCommand "dash-execute-simple-command" { } '' mkdir $out - ${dash}/bin/dash -c 'echo "Hello World!" > $out/success' + ${lib.getExe dash} -c 'echo "Hello World!" > $out/success' [ -s $out/success ] grep -q "Hello World" $out/success ''; }; }; -} + + meta = with lib; { + homepage = "http://gondor.apana.org.au/~herbert/dash/"; + description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; + platforms = platforms.unix; + license = with licenses; [ bsd3 gpl2 ]; + mainProgram = "dash"; + }; +}) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 5c3c43fc44ab5..32565af35be91 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - version = "unstable-2023-01-30"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-zsh-completions"; - rev = "6a1bfc024481bdba568f2ced65e02f3a359a7692"; - hash = "sha256-aXetjkl5nPuYHHyuX59ywXF+4Xg+PUCV6Y2u+g18gEk="; + rev = "refs/tags/${version}"; + hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix new file mode 100644 index 0000000000000..c6d32f8d76120 --- /dev/null +++ b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "zsh-fzf-history-search"; + version = "unstable-2023-03-08"; + + src = fetchFromGitHub { + owner = "joshskidmore"; + repo = "zsh-fzf-history-search"; + rev = "d1aae98ccd6ce153c97a5401d79fd36418cd2958"; + hash = "sha256-4Dp2ehZLO83NhdBOKV0BhYFIvieaZPqiZZZtxsXWRaQ="; + }; + + dontConfigure = true; + dontBuild = true; + strictDeps = true; + + installPhase = '' + runHook preInstall + + install -D zsh-fzf-history-search*.zsh --target-directory=$out/share/zsh-fzf-history-search + + runHook postInstall + ''; + + meta = { + description = "A simple zsh plugin that replaces Ctrl+R with an fzf-driven select which includes date/times"; + homepage = "https://github.com/joshskidmore/zsh-fzf-history-search"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ janik ]; + }; +} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index cf194be92bd75..0d9ae8d3c4fb9 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -70,7 +70,10 @@ let ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh - ../../build-support/setup-hooks/strip.sh + (with buildPlatform; if isAarch64 && isLinux + then ../../build-support/setup-hooks/strip-tmp-aarch64.sh + else ../../build-support/setup-hooks/strip.sh + ) ] ++ lib.optionals hasCC [ cc ]; defaultBuildInputs = extraBuildInputs; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1f596ada5a0b0..7fe5f67b14de8 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1594,7 +1594,7 @@ genericBuild() { if [ "$curPhase" = unpackPhase ]; then # make sure we can cd into the directory - [ -z "${sourceRoot}" ] || chmod +x "${sourceRoot}" + [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" cd "${sourceRoot:-.}" fi diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 344e3a892450e..66103ba6f8dc4 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -30,6 +30,7 @@ let inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; + disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); in buildPythonApplication rec { pname = "caffeine-ng"; diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index 9cc7ffb38eb54..db1c7beb2a58f 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { "jsonschema" "pathspec" "python-json-logger" - "pyyaml" + "PyYAML" "toolz" "unidiff" "yamllint" diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index dc5b34184ad09..e65cac675dbdb 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,39 +1,17 @@ { lib , python3 -, fetchFromGitHub , fetchPypi , groff , less }: -let - py = python3.override { - packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs rec { - version = "5.4.1"; - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - hash = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; - }; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all - runHook postCheck - ''; - }; - }; - self = py; - }; -in -with py.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.27.79"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-A3MVM5MV+PTwR4W2ALrqEtMaFtVAEt8yqkd4ZLsvHGE="; + hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; }; # https://github.com/aws/aws-cli/issues/4837 @@ -44,11 +22,10 @@ with py.pkgs; buildPythonApplication rec { --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ botocore bcdoc s3transfer - six colorama docutils rsa @@ -68,14 +45,15 @@ with py.pkgs; buildPythonApplication rec { ''; passthru = { - python = py; # for aws_shell + python = python3; # for aws_shell }; doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck - $out/bin/aws --version | grep "${py.pkgs.botocore.version}" + $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" $out/bin/aws --version | grep "${version}" runHook postInstallCheck diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index be8db6101d743..fa18015c8ff57 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -3,6 +3,7 @@ , groff , less , fetchFromGitHub +, fetchpatch , nix-update-script , testers , awscli2 @@ -10,8 +11,13 @@ let py = python3 // { - pkgs = python3.pkgs.overrideScope (self: super: { - # nothing right now + pkgs = python3.pkgs.overrideScope (final: prev: { + ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: { + src = prev.src.override { + version = "0.17.21"; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + }; + }); }); }; @@ -28,9 +34,19 @@ with py.pkgs; buildPythonApplication rec { hash = "sha256-gtzRHNEReCKzGDdiwS5kngcJYp5oAHmhnOPl/uTyxvU="; }; + patches = [ + # https://github.com/aws/aws-cli/pull/7912 + (fetchpatch { + name = "update-flit-core.patch"; + url = "https://github.com/aws/aws-cli/commit/83412a4b2ec750bada640a34a87bfe07ce41fb50.patch"; + hash = "sha256-uhO6aOSptsARYWuXXEFhx+6rCW5/uGn2KQ15BnhzH68="; + }) + ]; + postPatch = '' - substituteInPlace requirements/bootstrap.txt \ - --replace "pip>=22.0.0,<23.0.0" "pip>=22.0.0,<24.0.0" + substituteInPlace pyproject.toml \ + --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ + --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' ''; nativeBuildInputs = [ @@ -74,8 +90,6 @@ with py.pkgs; buildPythonApplication rec { rm $out/bin/aws.cmd ''; - doCheck = true; - preCheck = '' export PATH=$PATH:$out/bin export HOME=$(mktemp -d) @@ -107,7 +121,7 @@ with py.pkgs; buildPythonApplication rec { tests.version = testers.testVersion { package = awscli2; command = "aws --version"; - version = version; + inherit version; }; }; diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 2772bc49a457e..43e5ad9d650bf 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -15,6 +15,7 @@ let hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; sha256 = ""; }; + disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 9be1ea7f4d440..331d977147b2f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, acl }: +{ lib, stdenv, fetchurl, autoreconfHook, acl, libintl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnutar"; - version = "1.34"; + version = "1.35"; src = fetchurl { url = "mirror://gnu/tar/tar-${version}.tar.xz"; - sha256 = "sha256-Y769JoecXh7qQ1Lw0DyZH5Zq6z3es8dEXJAlaNVBHSg="; + sha256 = "sha256-TWL/NzQux67XSFNTI5MMfPlKz3HDWRiCsmp+pQ8+3BY="; }; # avoid retaining reference to CF during stdenv bootstrap @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; - buildInputs = lib.optional stdenv.isLinux acl; + # Add libintl on Darwin specifically as it fails to link (or skip) + # NLS on it's own: + # "_libintl_textdomain", referenced from: + # _main in tar.o + # ld: symbol(s) not found for architecture x86_64 + buildInputs = lib.optional stdenv.isLinux acl ++ lib.optional stdenv.isDarwin libintl; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 8016373208394..4c8f5ae80895b 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -52,6 +52,12 @@ python3Packages.buildPythonApplication { patches = extraPatches; + postPatch = '' + # https://github.com/beetbox/beets/pull/4868 + substituteInPlace beets/util/artresizer.py \ + --replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS" + ''; + propagatedBuildInputs = with python3Packages; [ confuse gst-python diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix index f771fd47a7584..bed9c415c83b5 100644 --- a/pkgs/tools/audio/headset-charge-indicator/default.nix +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eaAbqeFY+B3CcKJywC3vaRsWZNQENTbALc7L7uW0W6U="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ (python3.withPackages (ps: with ps; [ pygobject3 ])) headsetcontrol gtk3 - gobject-introspection libayatana-appindicator ]; diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix index 5315ee5723532..707828fae7138 100644 --- a/pkgs/tools/backup/gphotos-sync/default.nix +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { version = "3.1.2"; format = "pyproject"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; src = fetchFromGitHub { owner = "gilesknap"; @@ -22,9 +22,11 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "psutil" "exif" + "pyyaml" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 07f738ba6d90b..6e21a352d06f1 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; - version = "1.3.1"; + version = "1.3.2"; outputs = [ "bin" "dev" "out" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kspalaiologos"; repo = "bzip3"; rev = finalAttrs.version; - hash = "sha256-9yUd6FnobJEH/L5X4WMJFb9yLkJH9b8MAyhU2Wdtfig="; + hash = "sha256-nSmKpOwlbxbUN2TJwsS2CFP5UV2ODOKXFHAUsCje7mc="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/upspin/default.nix b/pkgs/tools/filesystems/upspin/default.nix new file mode 100644 index 0000000000000..eff560d8439eb --- /dev/null +++ b/pkgs/tools/filesystems/upspin/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "upspin"; + version = "unstable-2023-02-05"; + + src = fetchFromGitHub { + owner = "upspin"; + repo = "upspin"; + rev = "67e250ec27d8878c0009213b8e32c6803f2727ea"; + sha256 = "sha256-1pFDJSCUDKn4CTAg3wdB8oYPyrmd8B62zNl3m5YAqVM="; + }; + + vendorSha256 = "sha256-Jl++FvKyqz5WFa/Eoly+UnFsoC9Qwdaizhkq6LyJ+XQ="; + + # No upstream tests + doCheck = false; + + meta = with lib; { + description = "A global name space for storing data akin to a filesystem"; + homepage = "https://upspin.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ orthros ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 09a5362ae4007..299dd0e1385dc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { gtk3 gtk4 fmt - gobject-introspection fcitx5 pcre libuuid @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gobject-introspection ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f902be816ba28..848758b541464 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { vala wrapGAppsHook dbus-launch + gobject-introspection ]; propagatedBuildInputs = [ @@ -142,7 +143,6 @@ stdenv.mkDerivation rec { systemd dconf gdk-pixbuf - gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix new file mode 100644 index 0000000000000..c1868d819ba6f --- /dev/null +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, dbus +, libX11 +, libusb1 +, pkg-config +, udev +, wayland +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "keymapper"; + version = "2.6.2"; + + src = fetchFromGitHub { + owner = "houmain"; + repo = "keymapper"; + rev = finalAttrs.version; + hash = "sha256-XCrEM9TR2nxw1GjkpDzXl4eYXu8peaJAIYXRCltSCj4="; + }; + + # all the following must be in nativeBuildInputs + nativeBuildInputs = [ + cmake + pkg-config + dbus + wayland + libX11 + udev + libusb1 + ]; + + meta = { + changelog = "https://github.com/houmain/keymapper/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "A cross-platform context-aware key remapper"; + homepage = "https://github.com/houmain/keymapper"; + license = lib.licenses.gpl3Only; + mainProgram = "keymapper"; + maintainers = with lib.maintainers; [ dit7ya ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index e8bbb9540a11c..e6efabb5b33a3 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 60168b2e44f50..dc140c1c0c01c 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -1,36 +1,35 @@ -{ lib, python3, fetchFromGitHub }: - -let - # csvs-to-sqlite is currently not compatible with Click 8. See the following - # https://github.com/simonw/csvs-to-sqlite/issues/80 - # - # Workaround the issue by providing click 7 explicitly. - python = python3.override { - packageOverrides = self: super: { - # Use click 7 - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - }); - }; - }; -in with python.pkgs; buildPythonApplication rec { +{ lib, python3, fetchFromGitHub, fetchpatch }: + +with python3.pkgs; buildPythonApplication rec { pname = "csvs-to-sqlite"; - version = "1.2"; + version = "1.3"; format = "setuptools"; - disabled = !isPy3k; - src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - hash = "sha256-ZG7Yto8q9QNNJPB/LMwzucLfCGiqwBd3l0ePZs5jKV0"; + hash = "sha256-wV6htULG3lg2IhG2bXmc/9vjcK8/+WA7jm3iJu4ZoOE="; }; + patches = [ + # https://github.com/simonw/csvs-to-sqlite/pull/92 + (fetchpatch { + name = "pandas2-compatibility-1.patch"; + url = "https://github.com/simonw/csvs-to-sqlite/commit/fcd5b9c7485bc7b95bf2ed9507f18a60728e0bcb.patch"; + hash = "sha256-ZmaNWxsqeNw5H5gAih66DLMmzmePD4no1B5mTf8aFvI="; + }) + (fetchpatch { + name = "pandas2-compatibility-2.patch"; + url = "https://github.com/simonw/csvs-to-sqlite/commit/3d190aa44e8d3a66a9a3ca5dc11c6fe46da024df.patch"; + hash = "sha256-uYUH0Mhn6LIf+AHcn6WuCo5zFuSNWOZBM+AoqkmMnSI="; + }) + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ click dateparser @@ -39,15 +38,24 @@ in with python.pkgs; buildPythonApplication rec { six ]; + pythonRelaxDeps = [ + "click" + ]; + nativeCheckInputs = [ + cogapp pytestCheckHook ]; + disabledTests = [ + # Test needs to be adjusted for click >= 8. + "test_if_cog_needs_to_be_run" + ]; + meta = with lib; { description = "Convert CSV files into a SQLite database"; homepage = "https://github.com/simonw/csvs-to-sqlite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; - } diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index f3b2fa0e52b84..c1fa9ad4a1cab 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "cafkafk"; repo = "eza"; rev = "v${version}"; - hash = "sha256-9Pw7DQ/QTRHNsCPen+Nn5HdvjX1ju08q+KyitPF9+xQ="; + hash = "sha256-+MA9p15RGPaQ7Drhiljeb7KqThQnXMymjXFFS5sLxdM="; }; - cargoHash = "sha256-KveRmlgyree77ZDOB4hQA35F/u/ARKiAHRgHpjCXOow="; + cargoHash = "sha256-aplwr9X9MLhKrF5125gMtmuI/72RGf+1GZqkBYyxUSQ="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 73a81acd65e48..61690b5f41a90 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,19 +1,49 @@ -{ lib, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +, ffmpeg +, zlib +, libjpeg +}: python3Packages.buildPythonApplication { pname = "gif-for-cli"; version = "1.1.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = "gif-for-cli"; rev = "31f8aa2d617d6d6e941154f60e287c38dd9a74d5"; - sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M="; + hash = "sha256-Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M="; }; - nativeCheckInputs = [ python3Packages.coverage ]; - buildInputs = [ zlib libjpeg ]; - propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; + patches = [ + # https://github.com/google/gif-for-cli/pull/36 + (fetchpatch { + name = "pillow-10-compatibility.patch"; + url = "https://github.com/google/gif-for-cli/commit/49b13ec981e197cbc10f920b7b25a97c4cc6a61c.patch"; + hash = "sha256-B8wfkdhSUY++St6DzgaJ1xF1mZKvi8oxLXbo63yemDM="; + }) + ]; + + # coverage is not needed to build and test this package + postPatch = '' + sed -i '/coverage>=/d' setup.py + ''; + + buildInputs = [ + zlib + libjpeg + ]; + + propagatedBuildInputs = with python3Packages; [ + ffmpeg + pillow + requests + x256 + ]; meta = with lib; { description = "Render gifs as ASCII art in your cli"; @@ -22,5 +52,4 @@ python3Packages.buildPythonApplication { license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; }; - } diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 45cd96382381b..51e3a77d8d68d 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ gtk-doc lvm2 libxslt.bin - libtool readline gobject-introspection json-glib libuuid + libtool readline json-glib libuuid ]; meta = with lib; { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 398984b8c5341..b52628373594f 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,6 +1,7 @@ { buildPackages , db , fetchurl +, fetchpatch , groff , gzip , lib @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - sha256 = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; + hash = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; }; outputs = [ "out" "doc" ]; @@ -31,7 +32,35 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) nativeCheckInputs = [ libiconv /* for 'iconv' binary */ ]; - patches = [ ./systemwide-man-db-conf.patch ]; + patches = [ + ./systemwide-man-db-conf.patch + # Remove the patches below when updating to the next man-db release. + # Patches addressing https://gitlab.com/man-db/man-db/-/issues/25 ... + (fetchpatch { + name = "update-warning-regex"; + url = "https://gitlab.com/man-db/man-db/-/commit/b12ffb9df7.patch"; + hash = "sha256-F+whRppaMZwgmGPKTXu2j1vZMNAm3vGNzNZcz9pg8Jc="; + }) + (fetchpatch { + name = "fix-test-failures-when-iconv-not-available"; + url = "https://gitlab.com/man-db/man-db/-/commit/26f46a60e5.patch"; + hash = "sha256-W1a6GkYn4J3py7GLZc37xmQBQR18Xvcvj4fJoZ21+0k="; + # The following files are excluded from the patch as they fail to apply + # cleanly on the 2.11.2 sources and are deemed irrelevant for building man-db. + excludes = [ "NEWS.md" ]; + }) + # ... and https://gitlab.com/man-db/man-db/-/issues/26. + (fetchpatch { + name = "improve-lexgrog-portability"; + url = "https://gitlab.com/man-db/man-db/-/commit/bbf7701c4f.patch"; + hash = "sha256-QLOVgV0S2NxxTBObD8bJFR1QDH0p2RGMJXLVNagfddc="; + }) + (fetchpatch { + name = "avoid-translation-fallout-from-lexgrog-fix"; + url = "https://gitlab.com/man-db/man-db/-/commit/043c3cb83c.patch"; + hash = "sha256-w12/LOGN9gO85zmqX7zookA55w3WUxBMJgWInpH5wms="; + }) + ]; postPatch = '' # Remove all mandatory manpaths. Nixpkgs makes no requirements on @@ -79,7 +108,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; + doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */; passthru.tests = { nixos = nixosTests.man; diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index 9e89b57f0e40f..b80e9f974d487 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.3.2"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-vxAAAFLTIfLqYD7E/nwsHgFLhzMRF7DspIaWqAMZcXk="; + hash = "sha256-9VGvwMovJb1IIpwf+1FxcxnPcmPl+59jfQC6365E95s="; }; - cargoHash = "sha256-6GKLBnG1p6iaFvnEQgfNlGpZwEG93tI256DCMLuJjOU="; + cargoHash = "sha256-kxT0wJodPiHXX/bsvrlPbyfUbxPBgmv68a8I5pKOwEg="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 121e574358e6f..464b868b35d9c 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGui [ makeWrapper wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { util-linux ] ++ lib.optionals withGui [ cairo - gobject-introspection gtksourceview3 pango polkit diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index c8d3df4e2b27a..8b5d8d9e14f79 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev libusb1 cups python3Packages.python - libnotify gobject-introspection gdk-pixbuf pango atk packagekit + libnotify gdk-pixbuf pango atk packagekit libsecret ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { intltool pkg-config xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython - wrapGAppsHook autoreconfHook + wrapGAppsHook autoreconfHook gobject-introspection ]; pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 563b7c5b58423..d6e78b2cfb792 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -1,20 +1,23 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { pname = "containerlab"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-Vs3+5lnHy1QOisyq8heHlkE+Ezd6jDTFiTZUPxNQDnA="; + hash = "sha256-Wo6Dfcdax8EjZRP5JBKrnxpFTVx0GV+7uaDgBY/zg6I="; }; - vendorHash = "sha256-QaL4dlGw0az/hnYK20UOgh+AZ4wjhaopesJeN4zmeFE="; + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-uaYeFzG74VTUrtql6mSi+LNh6IjDomixrWwGQMgmONc="; ldflags = [ "-s" @@ -24,6 +27,14 @@ buildGoModule rec { "-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" ]; + postInstall = '' + local INSTALL="$out/bin/containerlab" + installShellCompletion --cmd containerlab \ + --bash <($out/bin/containerlab completion bash) \ + --fish <($out/bin/containerlab completion fish) \ + --zsh <($out/bin/containerlab completion zsh) + ''; + meta = with lib; { description = "Container-based networking lab"; homepage = "https://containerlab.dev/"; diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch index 3be4c273b3b3b..2c732621d9251 100644 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -27,10 +27,10 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. curl_includes_winsock2="\ diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index 99048c489..19abfbbac 100644 +index 727d123e5..f78d8be4a 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h -@@ -247,19 +247,6 @@ +@@ -250,19 +250,6 @@ #include <curl/system.h> @@ -42,7 +42,7 @@ index 99048c489..19abfbbac 100644 -#if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> -#define USE_RESOLVE_ON_IPS 1 --# if defined(TARGET_OS_OSX) && TARGET_OS_OSX +-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX -# define CURL_OSX_CALL_COPYPROXIES 1 -# endif -#endif diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 30f00df912c48..c15325a49e4de 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.1.2"; + version = "8.2.1"; src = fetchurl { urls = [ - "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" - "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" + "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" + "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-tUl00y/WEKys6S498fZDFEAVrGWEfwoEH9wX229D8kM="; + hash = "sha256-3TIva9CiDmzr39OI9p6Yw9GDvteSz0cTyKfvSYy6SJQ="; }; patches = [ diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index ddec798a8467a..944fd1b589770 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent, nixosTests }: stdenv.mkDerivation rec { pname = "dnscrypt-wrapper"; @@ -13,9 +13,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # causes `dnscrypt-wrapper --gen-provider-keypair` to crash + hardeningDisable = [ "fortify3" ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libsodium libevent ]; + passthru.tests = { + inherit (nixosTests) dnscrypt-wrapper; + }; + meta = with lib; { description = "A tool for adding dnscrypt support to any name resolver"; homepage = "https://dnscrypt.info/"; diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 078bd8e316d2e..72020b93c0134 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -2,9 +2,10 @@ , cargo , cmake , fetchFromGitHub -, fetchpatch , go , lib +, libgcrypt +, libgpg-error , libsecret , pkg-config , polkit @@ -24,29 +25,17 @@ let pname = "mozillavpn"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-eyYrA8ysfmXxlHNUBkGU9ioYrnbx3L1wP9byNz9L/MA="; + hash = "sha256-Yd53QUnoZ+5imt8kWpfGL6mkWeEFvqRrTpSu6efGgOA="; }; - patches = [ - # Force version downgrade for openssl and openssl-sys crates - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5911071ea37d12401af32dcdf2a542ca5049bf2f.patch"; - hash = "sha256-b3yOgn3Et0sYpqzUUdmlGIbzZSz13Q9HW56hyQqRnHc="; - revert = true; - }) - # [2.15] Restore qtglean/Cargo.lock - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/7026/commits/13c1b77ee4249883a33b6ac240b3ca143b485ba1.patch"; - hash = "sha256-L4D71zreDMLAIbP4x1as9QdNmMC1snUZSwlkKehg5yM="; - }) - ]; + patches = [ ]; - netfilter-goModules = (buildGoModule { + netfilterGoModules = (buildGoModule { inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; @@ -56,19 +45,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-R/9ePEhc4qVgg3WC5ng+cD88K/N3PTnx4QWyaZZfRds="; + hash = "sha256-WKnc2nGXJVhzNluh0RFSdmPtGdo2QnNuEJ7r5xJCGi0="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-27g2qnnUrxbThM1cHZquQgWQLWDtZaBnlf8PjvQtBJU="; + hash = "sha256-XlOnUB0TO6rrLkWU9eT1sTOcDtJdz4yi/ejKcEfFcFc="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-cW+nf+Dho+eSzOBo3xhxki7NXpg0wd5ZM9OMA6iOUl4="; + hash = "sha256-BU++ZWb4Fp8LS2woohuDSD2iYo/3rBO6xgeLzyrdLkU="; }; in @@ -76,8 +65,9 @@ stdenv.mkDerivation { inherit pname version src patches; buildInputs = [ + libgcrypt + libgpg-error libsecret - polkit qt5compat qtbase qtnetworkauth @@ -85,6 +75,7 @@ stdenv.mkDerivation { qtwebsockets ]; nativeBuildInputs = [ + cargo cmake go pkg-config @@ -92,8 +83,8 @@ stdenv.mkDerivation { python3.pkgs.glean-parser python3.pkgs.pyyaml python3.pkgs.setuptools + qttools rustPlatform.cargoSetupHook - cargo rustc wrapQtAppsHook ]; @@ -117,22 +108,15 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" - - substituteInPlace scripts/addon/build.py \ - --replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \ - --replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"' - substituteInPlace src/apps/vpn/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ - --replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - ln -s '${netfilter-goModules}' linux/netfilter/vendor + ln -s '${netfilterGoModules}' linux/netfilter/vendor pushd extension/bridge cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index ab747df01f864..4983c30ab00b9 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection systemd libselinux audit diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index 7af0be418352d..2d4656e69b706 100644 --- a/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation rec { sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0="; }; - buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython ]; dontBuild = true; diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index 735936a4da41f..08979e71e35ed 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook4 appstream-glib desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -44,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { gtk4 librsvg libadwaita - gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index d6a5df6272f45..1e24de6d1961c 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -6,7 +6,7 @@ , installShellFiles , pkg-config , bzip2 -, libgit2 +, libgit2_1_6 , openssl , zlib , zstd @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 curl - libgit2 + libgit2_1_6 openssl zlib zstd diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 69eab159c7977..62c4ac5996974 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -23,6 +23,14 @@ let self.lockfile ]; }); + keyring = super.keyring.overridePythonAttrs (old: rec { + version = "23.13.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng="; + }; + }); poetry-core = super.poetry-core.overridePythonAttrs (old: rec { version = "1.6.1"; src = fetchFromGitHub { @@ -36,17 +44,6 @@ let self.tomli-w ]; }); - virtualenv = super.virtualenv.overridePythonAttrs (old: rec { - version = "20.23.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-j/GaOMECHHQhSO3E+By0PX+MaBbS7eKrcq9bhMdJreE="; - }; - nativeCheckInputs = old.nativeCheckInputs ++ [ - self.time-machine - ]; - }); } // (plugins self); }; diff --git a/pkgs/tools/security/das/default.nix b/pkgs/tools/security/das/default.nix index f8ccf8cb4ac7f..2f7cd2fa98f7b 100644 --- a/pkgs/tools/security/das/default.nix +++ b/pkgs/tools/security/das/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "das"; - version = "0.3.6"; + version = "0.3.8"; format = "pyproject"; src = fetchFromGitHub { owner = "snovvcrash"; repo = "DivideAndScan"; rev = "refs/tags/v${version}"; - hash = "sha256-UFuIy19OUiS8VmmfGm0F4hI4s4BU5b4ZVh40bFGiLfk="; + hash = "sha256-a9gnEBTvZshw42M/GrpCgjZh6FOzL45aZqGRyeHO0ec="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'networkx = "^2.8.4"' 'networkx = "*"' + --replace 'networkx = "^2.8.4"' 'networkx = "*"' \ + --replace 'pandas = "^1.4.2"' 'pandas = "*"' ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/firefox_decrypt/default.nix b/pkgs/tools/security/firefox_decrypt/default.nix index d006e3140bf84..f0f2e1cf76d41 100644 --- a/pkgs/tools/security/firefox_decrypt/default.nix +++ b/pkgs/tools/security/firefox_decrypt/default.nix @@ -25,9 +25,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ]; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/unode/firefox_decrypt"; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 4cf5338ca2e4f..33f6297905ea9 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ glib @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { libgee xorg.libSM xorg.libICE - gobject-introspection libsecret ]; diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index a8d7f4c6b5321..f2d706bfe5105 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "maigret"; version = "0.4.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "soxoj"; @@ -15,7 +17,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs="; }; + patches = [ + # https://github.com/soxoj/maigret/pull/1117 + (fetchpatch { + name = "pytest-7.3-compatibility.patch"; + url = "https://github.com/soxoj/maigret/commit/ecb33de9e6eec12b6b45a1152199177f32c85be2.patch"; + hash = "sha256-nFx3j1Q37YLtYhb0QS34UgZFgAc5Z/RVgbO9o1n1ONE="; + }) + ]; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3.pkgs; [ aiodns aiohttp @@ -57,6 +69,8 @@ python3.pkgs.buildPythonApplication rec { yarl ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = with python3.pkgs; [ pytest-httpserver pytest-asyncio diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 6e73375be208e..e789eeba05394 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "sha256-R+dHYG0DBI1uo+yF/pxoTv/V9WSfph043bH6erZjeCE="; + sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index acc617103d719..7647246369ff3 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* + ''; meta = { description = "A program for calculating fuzzy hashes"; diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/tools/system/gkraken/default.nix index b5bb7fd03c1b3..f37a21db79f47 100644 --- a/pkgs/tools/system/gkraken/default.nix +++ b/pkgs/tools/system/gkraken/default.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection glib gtk3 libnotify diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix index 1fadb827d03c8..8e01940053088 100644 --- a/pkgs/tools/text/frogmouth/default.nix +++ b/pkgs/tools/text/frogmouth/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "frogmouth"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Textualize"; repo = "frogmouth"; rev = "v${version}"; - hash = "sha256-GVXzYPYvqgWRFOZW+dfYVI6Dhk9yUmuJ7V8wtM0VjR0="; + hash = "sha256-TMCeIwMEoNDQV9iue4XrdYQMmwofXDvdMMLTZKILQ9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch b/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch deleted file mode 100644 index 671293cda5b1a..0000000000000 --- a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1454525f70b43a6957b7c9e1870e997368787da3 Mon Sep 17 00:00:00 2001 -From: Samuel Dionne-Riel <samuel@dionne-riel.com> -Date: Fri, 8 Nov 2019 21:59:21 -0500 -Subject: [PATCH] Fix cross-compilation by looking for `ar`. - ---- - Makefile.am | 2 +- - configure.ac | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d18c49b8..b1b53338 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -494,7 +494,7 @@ CCC=@CXX@ - # INSTALL_INFO - # LN_S - --AR=ar -+AR=@AR@ - ETAGS=etags - ETAGSFLAGS= - # Flag that tells etags to assume C++. -diff --git a/configure.ac b/configure.ac -index 28e75f17..2449b9f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,6 +37,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - - AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin]) - AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_USE_SYSTEM_EXTENSIONS - -@@ -72,6 +73,7 @@ GROFF_DOC_CHECK - GROFF_MAKEINFO - GROFF_TEXI2DVI - AC_PROG_RANLIB -+AC_CHECK_TOOL([AR], [ar], [ar]) - GROFF_INSTALL_SH - GROFF_INSTALL_INFO - AC_PROG_INSTALL --- -2.23.0 - diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index ae250f2efeeaf..df06292c4f3ef 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -14,30 +14,16 @@ stdenv.mkDerivation rec { pname = "groff"; - version = "1.22.4"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; - sha256 = "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"; + hash = "sha256-a5dX9ZK3UYtJAutq9+VFcL3Mujeocf3bLTCuOGNRHBM="; }; outputs = [ "out" "man" "doc" "info" "perl" ]; - # Parallel build is failing for missing depends. Known upstream as: - # https://savannah.gnu.org/bugs/?62084 - # fixed, planned release: 1.23.0 - enableParallelBuilding = false; - - patches = [ - ./0001-Fix-cross-compilation-by-looking-for-ar.patch - ] - ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") [ - # https://trac.macports.org/ticket/59783 - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/ce265cf467f1c3e5ba2edbfbef2170df1a727a52/meta/recipes-extended/groff/files/0001-Include-config.h.patch"; - sha256 = "1b0mg31xkpxkzlx696nr08rcc7ndpaxdplvysy0hw5099c4n1wyf"; - }) - ]; + enableParallelBuilding = true; postPatch = '' # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs @@ -53,8 +39,7 @@ stdenv.mkDerivation rec { --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" - substituteInPlace contrib/groffer/roff2.pl \ - --replace "'gs'" "'${lib.getBin ghostscript}/bin/gs'" + '' + lib.optionalString (enableGhostscript || enableHtml) '' substituteInPlace contrib/pdfmark/pdfroff.sh \ --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \ --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk" @@ -119,11 +104,6 @@ stdenv.mkDerivation rec { substituteInPlace $perl/bin/gpinyin \ --replace $out/lib/groff/gpinyin $perl/lib/groff/gpinyin - moveToOutput bin/groffer $perl - moveToOutput lib/groff/groffer $perl - substituteInPlace $perl/bin/groffer \ - --replace $out/lib/groff/groffer $perl/lib/groff/groffer - moveToOutput bin/grog $perl moveToOutput lib/groff/grog $perl substituteInPlace $perl/bin/grog \ diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac index 776a7abb1da75..07923f1200095 100644 --- a/pkgs/tools/text/groff/site.tmac +++ b/pkgs/tools/text/groff/site.tmac @@ -9,11 +9,5 @@ . char \' \N'39' . \} . -. \" Shut off SGR by default (groff colors) -. \" Require GROFF_SGR envvar defined to turn it on -. if '\V[GROFF_SGR]'' \ -. output x X tty: sgr 0 -.\} -. .ds doc-default-operating-system Nixpkgs .ds doc-volume-operating-system Nixpkgs diff --git a/pkgs/tools/text/mw/default.nix b/pkgs/tools/text/mw/default.nix new file mode 100644 index 0000000000000..c85b018280373 --- /dev/null +++ b/pkgs/tools/text/mw/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildNpmPackage +}: + +buildNpmPackage rec { + pname = "mw"; + version = "unstable-2023-08-04"; + + src = fetchFromGitHub { + owner = "mark-when"; + repo = "mw"; + rev = "a8676da1c7812a051456fabcb980c52a72f6e75e"; + hash = "sha256-i95WuTH8qY+0PYQA9kOykQL+4d4oB2Hlvg9sfGtDeCo="; + }; + + npmDepsHash = "sha256-D1hTaoM4j81qrrLMoKJ7OxJTfRoht3/yqgJs95EFxY4="; + + # correctly substitute the usage message + postPatch = '' + substituteInPlace src/index.ts --replace \ + '.usage("$0' '.usage("mw' + ''; + + meta = { + changelog = "https://github.com/mark-when/mw/blob/${src.rev}/CHANGELOG.md"; + description = "Markwhen CLI"; + homepage = "https://github.com/mark-when/mw"; + license = lib.licenses.mit; + longDescription = '' + Markwhen is an interactive text-to-timeline tool. Write markdown-ish text and it gets converted into a nice looking cascading timeline. + ''; + mainProgram = "mw"; + maintainers = with lib.maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/tools/text/textpieces/default.nix index d9bd7a07b828f..9cea993710a8f 100644 --- a/pkgs/tools/text/textpieces/default.nix +++ b/pkgs/tools/text/textpieces/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 appstream-glib desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -54,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { libgee json-glib gtksourceview5 - gobject-introspection ]; runtimeDependencies = [ diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 8cf45ea584c04..122f4304838be 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -108,8 +108,14 @@ stdenv.mkDerivation rec { --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);" ''; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; outputs = [ "out" "doc" "man" "dev" ]; diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/tools/typesetting/typst/Cargo.lock index 044c7c9836d4b..29fb6b96bd5fd 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/tools/typesetting/typst/Cargo.lock @@ -100,17 +100,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -167,6 +156,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -255,21 +250,6 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" @@ -288,7 +268,7 @@ dependencies = [ "anstream", "anstyle", "bitflags 1.3.2", - "clap_lex 0.4.1", + "clap_lex", "strsim", ] @@ -298,7 +278,7 @@ version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8" dependencies = [ - "clap 4.2.7", + "clap", ] [[package]] @@ -315,15 +295,6 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" @@ -334,7 +305,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4237e29de9c6949982ba87d51709204504fb8ed2fd38232fcb1e5bf7d4ba48c8" dependencies = [ - "clap 4.2.7", + "clap", "roff", ] @@ -425,9 +396,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -446,6 +417,12 @@ dependencies = [ ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "csv" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -473,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core", @@ -555,6 +532,12 @@ dependencies = [ ] [[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.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,6 +559,22 @@ dependencies = [ ] [[package]] +name = "exr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] name = "fancy-regex" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -632,6 +631,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -674,6 +686,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -689,8 +713,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -704,10 +730,13 @@ dependencies = [ ] [[package]] -name = "glob" -version = "0.3.1" +name = "half" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] [[package]] name = "hashbrown" @@ -716,6 +745,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "hayagriva" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -744,33 +779,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hypher" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cf92443ef10ecfc1b8b4b65a93e31d983f020a355699d83874b12a7c797ac3" +checksum = "927f74d31cdbfd8de201340c0bc474c52c9145193ccd8885fcede14005591aad" [[package]] name = "iai" @@ -940,11 +957,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", + "qoi", + "tiff", ] [[package]] @@ -979,8 +999,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "rayon", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -990,18 +1021,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" dependencies = [ "ahash", - "clap 4.2.7", + "clap", "crossbeam-channel", "crossbeam-utils", "dashmap", "env_logger", - "indexmap", + "indexmap 1.9.3", "is-terminal", "itoa", "log", "num-format", "once_cell", - "quick-xml", + "quick-xml 0.26.0", "rgb", "str_stack", ] @@ -1041,7 +1072,7 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -1061,7 +1092,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "io-lifetimes", "rustix", "windows-sys 0.48.0", @@ -1106,6 +1137,9 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" @@ -1152,6 +1186,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "libc" version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1182,6 +1222,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1245,9 +1294,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1275,6 +1324,15 @@ dependencies = [ ] [[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] name = "notify" version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1356,11 +1414,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -1371,6 +1429,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] +name = "oklab" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" +dependencies = [ + "rgb", +] + +[[package]] name = "once_cell" version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1393,12 +1460,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1411,11 +1472,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630638e107fb436644c300e781d3f17e1b04656138ba0d40564be4be3b06db32" dependencies = [ "bitvec", - "clap 3.2.25", "crossbeam-channel", "filetime", "image", - "indexmap", + "indexmap 1.9.3", "itertools", "libdeflater", "log", @@ -1423,8 +1483,6 @@ dependencies = [ "rgb", "rustc-hash", "rustc_version", - "stderrlog", - "wild", "zopfli", ] @@ -1455,9 +1513,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pdf-writer" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6" +checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1495,6 +1553,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] name = "pin-project-lite" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1510,6 +1588,20 @@ dependencies = [ ] [[package]] +name = "plist" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +dependencies = [ + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml 0.28.2", + "serde", + "time", +] + +[[package]] name = "png" version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1569,6 +1661,15 @@ dependencies = [ ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] name = "quick-xml" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1578,6 +1679,15 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] name = "quote" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1703,8 +1813,11 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" dependencies = [ + "gif", + "jpeg-decoder", "log", "pico-args", + "png", "rgb", "svgtypes", "tiny-skia", @@ -1729,7 +1842,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -1843,6 +1956,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1919,13 +2038,26 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", ] [[package]] +name = "serde_yaml" +version = "0.9.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] name = "sharded-slab" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1977,6 +2109,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1996,18 +2137,6 @@ dependencies = [ ] [[package]] -name = "stderrlog" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" -dependencies = [ - "atty", - "log", - "termcolor", - "thread_local", -] - -[[package]] name = "str_stack" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2058,8 +2187,9 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] name = "svg2pdf" -version = "0.4.1" -source = "git+https://github.com/typst/svg2pdf#35f4bb87fb677473661c6d12919e01a6d64a716d" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24" dependencies = [ "image", "miniz_oxide", @@ -2124,12 +2254,14 @@ dependencies = [ "fnv", "lazy_static", "once_cell", + "plist", "regex-syntax 0.6.29", "serde", "serde_derive", "serde_json", "thiserror", "walkdir", + "yaml-rust", ] [[package]] @@ -2172,12 +2304,6 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "thiserror" version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2208,6 +2334,17 @@ dependencies = [ ] [[package]] +name = "tiff" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] name = "time" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2313,7 +2450,7 @@ version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", "serde_spanned", "toml_datetime", @@ -2413,7 +2550,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.6.0" +version = "0.7.0" dependencies = [ "bitflags 2.3.1", "bytemuck", @@ -2423,9 +2560,10 @@ dependencies = [ "fontdb", "if_chain", "image", - "indexmap", + "indexmap 1.9.3", "log", "miniz_oxide", + "oklab", "once_cell", "pdf-writer", "pixglyph", @@ -2444,6 +2582,7 @@ dependencies = [ "tracing", "ttf-parser", "typst-macros", + "typst-syntax", "unicode-general-category", "unicode-ident", "unicode-math-class", @@ -2455,10 +2594,10 @@ dependencies = [ [[package]] name = "typst-cli" -version = "0.6.0" +version = "0.7.0" dependencies = [ "chrono", - "clap 4.2.7", + "clap", "clap_complete", "clap_mangen", "codespan-reporting", @@ -2471,6 +2610,9 @@ dependencies = [ "once_cell", "open", "same-file", + "serde", + "serde_json", + "serde_yaml 0.9.25", "siphasher", "tar", "tempfile", @@ -2486,7 +2628,7 @@ dependencies = [ [[package]] name = "typst-docs" -version = "0.6.0" +version = "0.7.0" dependencies = [ "comemo", "heck", @@ -2494,7 +2636,7 @@ dependencies = [ "once_cell", "pulldown-cmark", "serde", - "serde_yaml", + "serde_yaml 0.8.26", "syntect", "typed-arena", "typst", @@ -2506,7 +2648,7 @@ dependencies = [ [[package]] name = "typst-library" -version = "0.6.0" +version = "0.7.0" dependencies = [ "az", "chinese-number", @@ -2527,7 +2669,7 @@ dependencies = [ "roxmltree", "rustybuzz", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "smallvec", "syntect", "time", @@ -2544,7 +2686,7 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "heck", "proc-macro2", @@ -2553,10 +2695,25 @@ dependencies = [ ] [[package]] +name = "typst-syntax" +version = "0.7.0" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + +[[package]] name = "typst-tests" -version = "0.6.0" +version = "0.7.0" dependencies = [ - "clap 4.2.7", + "clap", "comemo", "iai", "once_cell", @@ -2679,6 +2836,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" [[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + +[[package]] name = "unscanny" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2897,15 +3060,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] -name = "wild" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" -dependencies = [ - "glob", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3135,7 +3289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a94fb32d2b438e3fddf901fbfe9eb87b34d63853ca6c6da5d2ab7e27031e0bae" dependencies = [ "serde", - "serde_yaml", + "serde_yaml 0.8.26", ] [[package]] @@ -3218,13 +3372,21 @@ dependencies = [ [[package]] name = "zopfli" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b2bed49d3f0af28729a2338ee8c3a48eba2133a78ebc560779be161ebaaad8" +checksum = "4e0650ae6a051326d798eb099b632f1afb0d323d25ee4ec82ffb0779512084d5" dependencies = [ - "byteorder", "crc32fast", "log", "simd-adler32", "typed-arena", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 8cd9cda0e3299..adcbee4bb28ee 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -8,20 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A="; + hash = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; - "svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ="; }; }; @@ -38,10 +37,10 @@ rustPlatform.buildRustPackage rec { }; postInstall = '' - installManPage cli/artifacts/*.1 + installManPage crates/typst-cli/artifacts/*.1 installShellCompletion \ - cli/artifacts/typst.{bash,fish} \ - --zsh cli/artifacts/_typst + crates/typst-cli/artifacts/typst.{bash,fish} \ + --zsh crates/typst-cli/artifacts/_typst ''; meta = with lib; { diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 696b0b822e51c..01b05b5481f5f 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi, glibcLocales, docker-compose_1 }: +{ lib, python3, fetchFromGitHub, glibcLocales, docker-compose_1, git }: let docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override { inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; @@ -18,56 +18,29 @@ let cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; - pyyaml = super.pyyaml.overridePythonAttrs rec { - version = "5.4.1"; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all - runHook postCheck - ''; - src = fetchPypi { - pname = "PyYAML"; - inherit version; - hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; - }; - }; }; }; in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; version = "3.20.7"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hnLWqc4UzUnvz4wmKZ8JcEWUMPmh2BdQS1IAyxC+yb4="; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-elastic-beanstalk-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-DxjoEkFnY4aSfxVKPpnJLmnjLtZnlM74XXd0K8mcdoY="; }; - - preConfigure = '' - substituteInPlace requirements.txt \ - --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ - --replace "pathspec==0.10.1" "pathspec>=0.10.0,<1" \ - --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ - --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3" - ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; buildInputs = [ glibcLocales ]; - nativeCheckInputs = [ - pytest - mock - nose - pathspec - colorama - requests - docutils - ]; - - doCheck = true; - propagatedBuildInputs = [ blessed botocore @@ -85,6 +58,38 @@ with localPython.pkgs; buildPythonApplication rec { docker_compose ]; + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-socket + mock + git + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + disabledTests = [ + # Needs docker installed to run. + "test_local_run" + "test_local_run__with_arguments" + + # Needs access to the user's ~/.ssh directory. + "test_generate_and_upload_keypair__exit_code_0" + "test_generate_and_upload_keypair__exit_code_1" + "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" + "test_generate_and_upload_keypair__ssh_keygen_not_present" + ]; + meta = with lib; { homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; diff --git a/pkgs/tools/wayland/chayang/default.nix b/pkgs/tools/wayland/chayang/default.nix new file mode 100644 index 0000000000000..ccfba6a0cf020 --- /dev/null +++ b/pkgs/tools/wayland/chayang/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wayland-scanner +, wayland-protocols +, wayland +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chayang"; + version = "0.1.0"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "chayang"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3Vu9/Bu2WQe2Yx/2BK25pEpuPNwX6g3qoFUMznCFHeI="; + }; + + strictDeps = true; + + pkgsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + ]; + + buildInputs = [ + wayland-protocols + wayland + ]; + + meta = with lib; { + description = "Gradually dim the screen on Wayland"; + homepage = "https://git.sr.ht/~emersion/chayang/"; + license = licenses.mit; + longDescription = '' + Gradually dim the screen on Wayland. + Can be used to implement a grace period before locking the session. + ''; + maintainers = with maintainers; [ mxkrsv ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3b8e51201377..37089d9bb614e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1362,7 +1362,6 @@ mapAliases ({ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 pleroma-otp = pleroma; # Added 2021-07-10 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13cbcf23ca7d7..997401e40c2e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4619,6 +4619,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + chayang = callPackage ../tools/wayland/chayang { }; + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { }; @@ -5023,9 +5025,9 @@ with pkgs; duperemove = callPackage ../tools/filesystems/duperemove { }; - dvc = callPackage ../applications/version-management/dvc { }; + dvc = with python3.pkgs; toPythonApplication dvc; - dvc-with-remotes = callPackage ../applications/version-management/dvc { + dvc-with-remotes = dvc.override { enableGoogle = true; enableAWS = true; enableAzure = true; @@ -6777,6 +6779,8 @@ with pkgs; keyd = callPackage ../tools/inputmethods/keyd { }; + keymapper = callPackage ../tools/inputmethods/keymapper { }; + twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7409,7 +7413,7 @@ with pkgs; dtc = callPackage ../development/compilers/dtc { }; - dt-schema = with python3Packages; toPythonApplication dtschema; + dt-schema = callPackage ../development/tools/dt-schema { }; dub = callPackage ../development/tools/build-managers/dub { }; @@ -11005,6 +11009,13 @@ with pkgs; mtm = callPackage ../tools/misc/mtm { }; + op-geth = callPackage ../applications/blockchains/optimism/geth.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + + optimism = callPackage ../applications/blockchains/optimism { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { }; @@ -15000,6 +15011,8 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; + zsh-fzf-history-search = callPackage ../shells/zsh/zsh-fzf-history-search { }; + zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { }; zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; @@ -16853,11 +16866,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_70 = callPackage ../development/compilers/rust/1_70.nix { + rust_1_71 = callPackage ../development/compilers/rust/1_71.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_70; + rust = rust_1_71; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16865,8 +16878,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_70 = rust_1_70.packages.stable; - rustPackages = rustPackages_1_70; + rustPackages_1_71 = rust_1_71.packages.stable; + rustPackages = rustPackages_1_71; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -17920,9 +17933,9 @@ with pkgs; inherit (darwin) libobjc; }; - inherit (callPackage ../development/interpreters/ruby { + inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }) mkRubyVersion mkRuby @@ -21295,6 +21308,18 @@ with pkgs; rev = "v${version}"; hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; + patches = []; + }; + + libgit2_1_6 = libgit2.overrideAttrs rec { + version = "1.6.4"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0="; + }; + patches = [ ]; }; libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -24938,6 +24963,8 @@ with pkgs; sv-lang = callPackage ../applications/science/electronics/sv-lang { }; + sqld = callPackage ../servers/sql/sqld { }; + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); unqlite = lowPrio (callPackage ../development/libraries/unqlite { }); @@ -25806,14 +25833,14 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl534 perl536 perldevel; + inherit (perlInterpreters) perl536 perl538 perldevel; - perl534Packages = recurseIntoAttrs perl534.pkgs; perl536Packages = recurseIntoAttrs perl536.pkgs; + perl538Packages = recurseIntoAttrs perl538.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl536; - perlPackages = perl536Packages; + perl = perl538; + perlPackages = perl538Packages; ack = perlPackages.ack; @@ -30831,6 +30858,8 @@ with pkgs; dia = callPackage ../applications/graphics/dia { }; + diebahn = callPackage ../applications/misc/diebahn { }; + digital = callPackage ../applications/science/electronics/digital { }; direwolf = callPackage ../applications/radio/direwolf { @@ -32275,6 +32304,8 @@ with pkgs; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + planner = callPackage ../applications/office/planner { }; + please-cli = callPackage ../applications/misc/please-cli { }; protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; @@ -32706,6 +32737,8 @@ with pkgs; joe = callPackage ../applications/editors/joe { }; + johnny = callPackage ../applications/misc/johnny { }; + josm = callPackage ../applications/misc/josm { }; js8call = qt5.callPackage ../applications/radio/js8call { }; @@ -33708,6 +33741,8 @@ with pkgs; mutt-ics = callPackage ../tools/networking/mutt-ics { }; + mw = callPackage ../tools/text/mw { }; + mwic = callPackage ../applications/misc/mwic { pythonPackages = python3Packages; }; @@ -40876,6 +40911,8 @@ with pkgs; unityhub = callPackage ../development/tools/unityhub { }; + upspin = callPackage ../tools/filesystems/upspin { }; + urbit = callPackage ../misc/urbit { }; usb-reset = callPackage ../applications/misc/usb-reset { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf31201fda7e3..62a3e6e586aff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1565,11 +1565,11 @@ with self; { BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; - version = "0.64"; + version = "0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz"; - hash = "sha256-U1yF6FScGsQ6IBYP3ALwpABhQVb9dhV//yiqM/2jdEs="; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.65.tar.gz"; + hash = "sha256-QQqonnIylB1JEGyeBI1jN0dVQ+wdIz6nzbcly1uWNQQ=i"; }; preConfigure = '' @@ -1705,10 +1705,10 @@ with self; { BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz"; - hash = "sha256-pc9rsoXQbRfO4id4O3I7snQhP9QVOl3uMR0kDhFpYG4="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.26.tar.gz"; + hash = "sha256-LaoVXS8mf7De3Yf4pMT7VmOHn8EGUXse4lg1Pvh67TQ="; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -5515,10 +5515,10 @@ with self; { CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.076"; + version = "0.078"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.076.tar.gz"; - hash = "sha256-u4SsASQ4x87NtRpab/+08f7jsOrgAi6WzrwuFnUiYhw="; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz"; + hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0="; }; meta = { description = "Cryptographic toolkit"; @@ -5562,6 +5562,9 @@ with self; { hash = "sha256-L+XheYgqa5Jt/vChCLSiyHof+waJK88vuI5Mj0uEODw="; }; buildInputs = [ TestRequires ]; + patches = [ + ../development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch + ]; meta = { description = "Polymorphic data cloning"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -6604,10 +6607,10 @@ with self; { DevelCaller = buildPerlPackage { pname = "Devel-Caller"; - version = "2.06"; + version = "2.07"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz"; - hash = "sha256-anOuaikoNCVbkNqUCSBUJTBfz+mUsUjcttLW72KNt98="; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.07.tar.gz"; + hash = "sha256-tnmisYA0sLcg3oLDcIckw2SxCmyhZMvGfNw68oPzUD8="; }; propagatedBuildInputs = [ PadWalker ]; meta = { @@ -7349,10 +7352,10 @@ with self; { DevelFindPerl = buildPerlPackage { pname = "Devel-FindPerl"; - version = "0.015"; + version = "0.016"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz"; - hash = "sha256-UnW33CJv5/Fstp/G+Z9eKahSxqTTt4arGIajE4Z0Pfw="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.016.tar.gz"; + hash = "sha256-Q6K/L3h6PxuIEXkGMWKyqj58sET25eduxkZq6QqGETg="; }; meta = { description = "Find the path to your perl"; @@ -7403,10 +7406,10 @@ with self; { DevelNYTProf = buildPerlPackage { pname = "Devel-NYTProf"; - version = "6.10"; + version = "6.12"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz"; - hash = "sha256-JKxBdPHwEyIGP6ThGbJH03HTJg3cpud4xsGg4/kF9Y4="; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.12.tar.gz"; + hash = "sha256-qDtZheTalr24X1McFqtvPUkHGnM80JSqMPqF+2pLAsQ="; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; buildInputs = [ CaptureTiny TestDifferences ]; @@ -8668,6 +8671,9 @@ with self; { hash = "sha256-VyPdePSsC00mKgXqRq9mPqANgJay6cCkNRXCEHYOHnU="; }; buildInputs = [ TestUnitLite ]; + patches = [ + ../development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch + ]; meta = { description = "Lightweight exceptions"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -8823,6 +8829,9 @@ with self; { url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz"; hash = "sha256-aTPQ6WO2IoHvdWEGjmrsrIxKwrR2srugmrC5D7rJ11c="; }; + patches = [ + ../development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch + ]; meta = { description = "Generate XS code to import C header constants"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11276,10 +11285,10 @@ with self; { HTMLMason = buildPerlPackage { pname = "HTML-Mason"; - version = "1.59"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz"; - hash = "sha256-lb7SpsSINwBGqjFL5LWSvWWmUi+IRdqLNqav+ai0OdA="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.60.tar.gz"; + hash = "sha256-qgu9WmtjxiyJVfjFXsCF43DXktZSZrbDtcXweIu8d+Y="; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; @@ -13865,10 +13874,10 @@ with self; { locallib = buildPerlPackage { pname = "local-lib"; - version = "2.000024"; + version = "2.000029"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz"; - hash = "sha256-LpuRe9SKBhXkJjOyoydJTgRhDY9xB2W5ST0wbOrZigU="; + url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000029.tar.gz"; + hash = "sha256-jfh6EMFMjpCcW0fFcB5LgYfVGeUlHofIBwmwK7M+/dc="; }; propagatedBuildInputs = [ ModuleBuild ]; meta = { @@ -14069,10 +14078,10 @@ with self; { LogLog4perl = buildPerlPackage { pname = "Log-Log4perl"; - version = "1.53"; + version = "1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.53.tar.gz"; - hash = "sha256-j7+0jQFu7HNEpTnzrXCHC0rEY45JZmv6cNEPb/1Kw44="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.57.tar.gz"; + hash = "sha256-D4/Ldjio89tMeX35T9vFYBN0kULy+Uy8lbQ8n8oJahM="; }; meta = { description = "Log4j implementation for Perl"; @@ -15220,10 +15229,10 @@ with self; { MIMECharset = buildPerlPackage { pname = "MIME-Charset"; - version = "1.012.2"; + version = "1.013.1"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz"; - hash = "sha256-h4x3nAJWxZFma9BsDN5MDXgg7uuY/RGDCCrumh57HRM="; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.013.1.tar.gz"; + hash = "sha256-G7em4MDSUfI9bmC/hMmt78W3TuxYR1v+5NORB+YIcPA="; }; meta = { description = "Charset Information for MIME"; @@ -15467,6 +15476,20 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; }; + postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # for unknown reason, the first run of Build fails + ./Build || true + ''; + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # remove version check since miniperl uses a stub of File::Temp, which do not provide a version: + # https://github.com/arsv/perl-cross/blob/master/cnf/stub/File/Temp.pm + sed -i '/File::Temp/d' \ + Build.PL + + # fix discover perl function, it can not handle a wrapped perl + sed -i "s,\$self->_discover_perl_interpreter,'$(type -p perl)',g" \ + lib/Module/Build/Base.pm + ''; meta = { description = "Build and install Perl modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -18613,10 +18636,10 @@ with self; { NumberFormat = buildPerlPackage { pname = "Number-Format"; - version = "1.75"; + version = "1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz"; - hash = "sha256-gtZZyxZGF2T9RNEanOnmpPXodn3BBp6wNGfG5V3iV/M="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Number-Format-1.76.tar.gz"; + hash = "sha256-DgBg6zY2NaiFcGxqJvX8qv6udZ97Ksrkndpw4ZXdRNY="; }; meta = { description = "Perl extension for formatting numbers"; @@ -18740,12 +18763,12 @@ with self; { ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.68"; + version = "0.79"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.68.tar.gz"; - hash = "sha256-xN5jBIQxMJZNrskozF99HphTnu/X7azHvn4Yg0XhnXE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.79.tar.gz"; + hash = "sha256-+wsQ+J5i1UFlvWqyHbVfYLVT+gCPyOddNJhwwafiKtY="; }; - buildInputs = [ TestFatal TestRefcount ]; + buildInputs = [ Test2Suite TestFatal TestRefcount ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { @@ -19195,10 +19218,10 @@ with self; { Parent = buildPerlPackage { pname = "parent"; - version = "0.238"; + version = "0.241"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz"; - hash = "sha256-OPWP3vPiihlMnI0NxdAmcvr5PAafQMW8sfq+rbvE0tE="; + url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.241.tar.gz"; + hash = "sha256-sQs5YKs5l9q3Vx/+l1ukYtl50IZFB0Ch4Is5WedRKP4="; }; meta = { description = "Establish an ISA relationship with base classes at compile time"; @@ -20236,10 +20259,10 @@ with self; { PPR = buildPerlPackage { pname = "PPR"; - version = "0.000028"; + version = "0.001008"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.000028.tar.gz"; - hash = "sha256-032ndHxDN+TH11jHuO1dEsuXN2Q2krCfC9TZnFBouak="; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.001008.tar.gz"; + hash = "sha256-EQ5xwF8uLJDrAfCgaU5VqdvpHIV+SBJeF0LRflzbHkk="; }; meta = { description = "Pattern-based Perl Recognizer"; @@ -21426,10 +21449,10 @@ with self; { ScopeUpper = buildPerlPackage { pname = "Scope-Upper"; - version = "0.33"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.33.tar.gz"; - hash = "sha256-XzO+Aa1o/L7G74HusDs1EaL18HUq1RPZk6TBOl+xpkg="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.34.tar.gz"; + hash = "sha256-WB2LxRDevQxFal/HlSy3E4rmZ78486d+ltdz3DGWpB4="; }; meta = { description = "Act on upper scopes"; @@ -23591,10 +23614,10 @@ with self; { Test2Harness = buildPerlPackage { pname = "Test2-Harness"; - version = "1.000042"; + version = "1.000152"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; - hash = "sha256-qvIxporxpv/WoRGIh1/PVy43PkPIKFlFInudaHtD2y0="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000152.tar.gz"; + hash = "sha256-iIqWAdvTPuuaSTcdZmK7JE8Ad/QJlM4gvJClvlSRqls="; }; checkPhase = '' @@ -23602,7 +23625,7 @@ with self; { ./scripts/yath test -j $NIX_BUILD_CORES ''; - propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite YAMLTiny gotofile ]; meta = { description = "A new and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23658,10 +23681,10 @@ with self; { Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000138"; + version = "0.000155"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000138.tar.gz"; - hash = "sha256-DPct8s7RFkhTW/2I6lSjxwBnhqfFlSkOOPMU41E7CHU="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000155.tar.gz"; + hash = "sha256-x45rxNabwJeDaXaGM4K1K54MMe4YUGbOYMVL10uq1T0="; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -25000,10 +25023,10 @@ with self; { TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302183"; + version = "1.302195"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302183.tar.gz"; - hash = "sha256-mgO9pexCCuqWkrZQQ39NW1dPpQX91/9gzbXz7ANBBv8="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"; + hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw="; }; meta = { description = "Basic utilities for writing tests"; @@ -25227,10 +25250,10 @@ with self; { TestWithoutModule = buildPerlPackage { pname = "Test-Without-Module"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz"; - hash = "sha256-jprrfDKmxtC4qTEU2yqMBychJzqdmi3U+cqGz9KKpSQ="; + url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.21.tar.gz"; + hash = "sha256-PN6vraxIU+vq/miTRtVV2l36PPqdTITj5ee/7lC+7EY="; }; meta = { description = "Test fallback behaviour in absence of modules"; @@ -25987,10 +26010,10 @@ with self; { TestTrap = buildPerlModule { pname = "Test-Trap"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz"; - hash = "sha256-CwRlbzO2yW2o7sTP/lKGFQtOS14pkdOINoaxCRAQWuI="; + url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.5.tar.gz"; + hash = "sha256-VPmQFlYrWx1yEQEA8fK+Q3F4zfhDdvSV/9A3bx1+y5o="; }; propagatedBuildInputs = [ DataDump ]; meta = { @@ -27084,10 +27107,10 @@ with self; { VariableMagic = buildPerlPackage { pname = "Variable-Magic"; - version = "0.62"; + version = "0.63"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz"; - hash = "sha256-P5oYUX4z8AapwvxPQ/AbVKv+b/Lq5zIkJPMQaSlrYVw="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.63.tar.gz"; + hash = "sha256-ukCDssMf8mlPI3EzPVVMgmqvJLTZjQPki1tKQ6Kg5nk="; }; meta = { description = "Associate user-defined magic to variables from Perl"; @@ -27995,12 +28018,12 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.25"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz"; - hash = "sha256-9e2zDPfH8iDQxsMdwetVQDKECpnHwpgxT1zD/vZscsc="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.34.tar.gz"; + hash = "sha256-EDPdtAmSTZ1Cs4MEodeXRaBDSrxrBJHrErbIu5bx1sE="; }; - buildInputs = [ ExtUtilsCChecker ]; + buildInputs = [ ExtUtilsCChecker Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39fda772e6a79..19e06c64e8f5d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -210,6 +210,7 @@ mapAliases ({ mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 + nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59b81af35ea25..d4bb7f8cfc43b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12,6 +12,8 @@ self: super: with self; { setuptools = callPackage ../development/python-modules/setuptools { }; + a2wsgi = callPackage ../development/python-modules/a2wsgi { }; + aadict = callPackage ../development/python-modules/aadict { }; aafigure = callPackage ../development/python-modules/aafigure { }; @@ -2349,10 +2351,10 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0b2"; + version = "3.0.0"; src = old.src.override { inherit version; - hash = "sha256-bEKAZWV56STBGURyR2ZLsi+v7cfezKWTqOogvdV9Z1U="; + hash = "sha256-NQsY+Wc+YxAdu/z3dO4vV8IKxGNtJVdB12ynkBaxvYI="; }; patches = [ ]; }); @@ -3185,6 +3187,8 @@ self: super: with self; { durus = callPackage ../development/python-modules/durus { }; + dvc = callPackage ../development/python-modules/dvc { }; + dvc-azure = callPackage ../development/python-modules/dvc-azure { }; dvc-data = callPackage ../development/python-modules/dvc-data { }; @@ -4835,6 +4839,8 @@ self: super: with self; { html5lib = callPackage ../development/python-modules/html5lib { }; + html5tagger = callPackage ../development/python-modules/html5tagger { }; + html5-parser = callPackage ../development/python-modules/html5-parser { }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -5316,7 +5322,6 @@ self: super: with self; { # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. inherit (pkgs.config) cudaSupport; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; - protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; jaxlib = self.jaxlib-build; @@ -5467,6 +5472,8 @@ self: super: with self; { jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; + jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; @@ -6065,7 +6072,7 @@ self: super: with self; { llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. - llvm = pkgs.llvm_11; + llvm = pkgs.llvm_14; }; lmdb = callPackage ../development/python-modules/lmdb { @@ -6548,6 +6555,7 @@ self: super: with self; { mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; + mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; @@ -6567,6 +6575,8 @@ self: super: with self; { ml-collections = callPackage ../development/python-modules/ml-collections { }; + ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; + mlflow = callPackage ../development/python-modules/mlflow { }; mlrose = callPackage ../development/python-modules/mlrose { }; @@ -7004,13 +7014,6 @@ self: super: with self; { withPython = true; }); - nghttp2 = (toPythonModule (pkgs.nghttp2.override { - python3Packages = self; - inherit (pkgs) ncurses; - enableApp = false; # build only libnghttp2 ... - enablePython = true; # ... and its Python bindings - })).python; - nh3 = callPackage ../development/python-modules/nh3 { }; niaaml = callPackage ../development/python-modules/niaaml { }; @@ -7597,7 +7600,9 @@ self: super: with self; { panasonic-viera = callPackage ../development/python-modules/panasonic-viera { }; - pandas = callPackage ../development/python-modules/pandas { }; + pandas = callPackage ../development/python-modules/pandas { + inherit (pkgs.darwin) adv_cmds; + }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -8781,6 +8786,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic-core = callPackage ../development/python-modules/pydantic-core { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydash = callPackage ../development/python-modules/pydash { }; @@ -12785,6 +12792,8 @@ self: super: with self; { traceback2 = callPackage ../development/python-modules/traceback2 { }; + tracerite = callPackage ../development/python-modules/tracerite { }; + tracing = callPackage ../development/python-modules/tracing { }; trackpy = callPackage ../development/python-modules/trackpy { }; |