diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml new file mode 100644 index 000000000000..3ca5707e09b4 --- /dev/null +++ b/.github/workflows/eval-lib-tests.yml @@ -0,0 +1,30 @@ +name: "Building Nixpkgs lib-tests" + +permissions: + contents: read + +on: + pull_request_target: + paths: + - 'lib/**' +jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + + nixpkgs-lib-tests: + name: nixpkgs-lib-tests + runs-on: ubuntu-latest + needs: get-merge-commit + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + if: needs.get-merge-commit.outputs.mergedSha + with: + # pull_request_target checks out the base branch by default + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - name: Building Nixpkgs lib-tests + run: | + nix-build --arg pkgs "(import ./ci/. {}).pkgs" ./lib/tests/release.nix diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000000..761678fd3fa0 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,22 @@ +queue_rules: + # This rule is for https://docs.mergify.com/commands/queue/ + # and can be triggered with: @mergifyio queue + - name: default + merge_conditions: + # all github action checks in this list are required to merge a pull request + - check-success=Attributes + - check-success=Check + - check-success=Outpaths (aarch64-darwin) + - check-success=Outpaths (aarch64-linux) + - check-success=Outpaths (x86_64-darwin) + - check-success=Outpaths (x86_64-linux) + - check-success=Process + - check-success=Request + - check-success=Tag + - check-success=editorconfig-check + - check-success=label-pr + - check-success=nix-files-parseable-check + - check-success=nixfmt-check + - check-success=nixpkgs-vet + # queue up to 5 pull requests at a time + batch_size: 5 diff --git a/ci/OWNERS b/ci/OWNERS index 5cc815b326c2..2ffee66285cf 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -157,6 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Python-related code and docs /doc/languages-frameworks/python.section.md @mweinelt @natsukium /maintainers/scripts/update-python-libraries @mweinelt @natsukium +/pkgs/by-name/up/update-python-libraries @mweinelt @natsukium /pkgs/development/interpreters/python @mweinelt @natsukium /pkgs/top-level/python-packages.nix @natsukium /pkgs/top-level/release-python.nix @natsukium @@ -206,8 +207,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Browsers /pkgs/applications/networking/browsers/firefox @mweinelt -/pkgs/applications/networking/browsers/chromium @emilylange -/nixos/tests/chromium.nix @emilylange +/pkgs/applications/networking/browsers/chromium @emilylange @networkException +/nixos/tests/chromium.nix @emilylange @networkException # Certificate Authorities pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b75edb135a3..effe1f76b920 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4668,6 +4668,13 @@ name = "Carl Richard Theodor Schneider"; keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; + cryo = { + email = "cryo@disroot.org"; + github = "cry0ice"; + githubId = 176274027; + name = "Cryo"; + keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591 F97F 4B12 E34A 25A9 AB35"; } ]; + }; Cryolitia = { name = "Cryolitia PukNgae"; email = "Cryolitia@gmail.com"; @@ -4800,6 +4807,12 @@ github = "d4ilyrun"; githubId = 34611103; }; + d4rk = { + name = "Anoop Menon"; + email = "d4rk@blackvoltage.org"; + github = "d4rk"; + githubId = 22163; + }; d4rkstar = { name = "Bruno Salzano"; email = "d4rkstar@gmail.com"; @@ -18091,6 +18104,13 @@ githubId = 4579165; name = "Danny Bautista"; }; + pyrotelekinetic = { + name = "Clover"; + email = "carter@isons.org"; + github = "pyrotelekinetic"; + githubId = 29682759; + keys = [ { fingerprint = "5963 78DB 25AA 608D 2743 D466 5D6A D9AE 71B3 F983"; } ]; + }; pyrox0 = { name = "Pyrox"; email = "pyrox@pyrox.dev"; @@ -22782,7 +22802,7 @@ githubId = 332418; }; tsandrini = { - email = "tomas.sandrini@seznam.cz"; + email = "t@tsandrini.sh"; name = "Tomáš Sandrini"; github = "tsandrini"; githubId = 21975189; diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 8717808daaf0..272b55e33d8f 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,3 +1,3 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git -exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ +exec python3 pkgs/by-name/up/update-python-libraries/update-python-libraries.py $@ diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md index 2edca78f4a38..89604941bf11 100644 --- a/nixos/doc/manual/configuration/user-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -122,7 +122,7 @@ The primary benefit of this is to remove a dependency on perl. This is experimental. ::: -Like systemd-sysusers, Userborn adoesn't depend on Perl but offers some more +Like systemd-sysusers, Userborn doesn't depend on Perl but offers some more advantages over systemd-sysusers: 1. It can create "normal" users (with a GID >= 1000). diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0a1365ec0a7a..734a724015da 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -24,6 +24,10 @@ - [waagent](https://github.com/Azure/WALinuxAgent), the Microsoft Azure Linux Agent (waagent) manages Linux provisioning and VM interaction with the Azure Fabric Controller. Available with [services.waagent](options.html#opt-services.waagent.enable). +- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). + +- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} @@ -50,6 +54,10 @@ - `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead. +- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. + +- `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. + - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. @@ -64,7 +72,7 @@ files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to `$out/share/fonts/{opentype,truetype}/NerdFonts/`, where `` can be found in the [official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font" - suffix and any whitespaces trimmed. + suffix and any whitespaces trimmed. Configuration changes are required, see build output. - `retroarch` has been refactored and the older `retroarch.override { cores = [ ... ]; }` to create a RetroArch derivation with custom cores doesn't work anymore, use `retroarch.withCores (cores: [ ... ])` instead. If you need more customization (e.g.: custom settings), use `wrapRetroArch` instead. @@ -85,6 +93,11 @@ add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the vim plugin. +- `prisma` and `prisma-engines` have been updated to version 6.0.1, which + introduces several breaking changes. See the + [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) + for more information. + ## Other Notable Changes {#sec-release-25.05-notable-changes} @@ -93,6 +106,8 @@ - Cinnamon has been updated to 6.4. +- `services.avahi.ipv6` now defaults to true. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 4692ed15a956..0d731dfbaebc 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -278,11 +278,23 @@ in PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no"; }; serviceConfig = { + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN"; Nice = 19; IOSchedulingClass = "idle"; + IPAddressDeny = "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; PrivateTmp = "yes"; + PrivateDevices = true; PrivateNetwork = "yes"; - NoNewPrivileges = "yes"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictAddressFamilies = "AF_UNIX"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; ReadOnlyPaths = "/"; # Use dirOf cfg.output because mlocate creates temporary files next to # the actual database. We could specify and create them as well, @@ -290,6 +302,8 @@ in # NOTE: If /var/cache does not exist, this leads to the misleading error message: # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory ReadWritePaths = dirOf cfg.output; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service @chown"; }; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2062229b98fb..ed62fc9d6c3e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -588,6 +588,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix + ./services/hardware/buffyboard.nix ./services/hardware/ddccontrol.nix ./services/hardware/display.nix ./services/hardware/fancontrol.nix diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d6195d24ea8d..e463e48f675e 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -210,5 +210,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ julm ]; + meta.maintainers = with lib.maintainers; [ julm grimmauld ]; } diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 3e126875c687..6d0be0879440 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -170,15 +170,6 @@ static int make_caps_ambient(const char *self_path) { "MALLOC_ARENA_TEST\0" int main(int argc, char **argv) { - ASSERT(argc >= 1); - - // argv[0] goes into a lot of places, to a far greater degree than other elements - // of argv. glibc has had buffer overflows relating to argv[0], eg CVE-2023-6246. - // Since we expect the wrappers to be invoked from either $PATH or /run/wrappers/bin, - // there should be no reason to pass any particularly large values here, so we can - // be strict for strictness' sake. - ASSERT(strlen(argv[0]) < 512); - int debug = getenv(wrapper_debug) != NULL; // Drop insecure environment variables explicitly @@ -209,10 +200,22 @@ int main(int argc, char **argv) { return 1; } + char *replacement_argv[2] = {SOURCE_PROG, NULL}; + char *old_argv0; + // Replace untrusted or missing argv[0] by the wrapped program path. + // This mitigates vulnerabilities caused by incorrect handling in privileged code. + if (argv[0]) { + old_argv0 = argv[0]; + argv[0] = SOURCE_PROG; + } else { + old_argv0 = "«nullptr»"; + argv = replacement_argv; + } + execve(SOURCE_PROG, argv, environ); - + fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], SOURCE_PROG, strerror(errno)); + old_argv0, SOURCE_PROG, strerror(errno)); return 1; } diff --git a/nixos/modules/services/continuous-integration/github-runners.nix b/nixos/modules/services/continuous-integration/github-runners.nix index 4a4608c2e4f8..3a4a13d92b56 100644 --- a/nixos/modules/services/continuous-integration/github-runners.nix +++ b/nixos/modules/services/continuous-integration/github-runners.nix @@ -6,5 +6,5 @@ ./github-runner/service.nix ]; - meta.maintainers = with lib.maintainers; [ veehaitch newam ]; + meta.maintainers = with lib.maintainers; [ veehaitch ]; } diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 8d245ce0050c..f48cce7ab210 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -90,6 +90,7 @@ in lomiri-filemanager-app lomiri-gallery-app lomiri-history-service + lomiri-mediaplayer-app lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix new file mode 100644 index 000000000000..f6cab16138c0 --- /dev/null +++ b/nixos/modules/services/hardware/buffyboard.nix @@ -0,0 +1,138 @@ +# INTEGRATION NOTES: +# Buffyboard integrates as a virtual device in /dev/input +# which reads touch or pointer events from other input devices +# and generates events based on where those map to the keys it renders to the framebuffer. +# +# Buffyboard generates these events whether or not its onscreen keyboard is actually visible. +# Hence special care is needed if running anything which claims ownership of the display (such as a desktop environment), +# to avoid unwanted input events being triggered during normal desktop operation. +# +# Desktop users are recommended to either: +# 1. Stop buffyboard once your DE is started. +# e.g. `services.buffyboard.unitConfig.Conflicts = [ "my-de.service" ];` +# 2. Configure your DE to ignore input events from buffyboard (product-id=25209; vendor-id=26214; name=rd) +# e.g. `echo 'input "26214:25209:rd" events disabled' > ~/.config/sway/config` + +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.buffyboard; + ini = pkgs.formats.ini { }; +in +{ + meta.maintainers = with lib.maintainers; [ colinsane ]; + + options = { + services.buffyboard = with lib; { + enable = mkEnableOption "buffyboard framebuffer keyboard (on-screen keyboard)"; + package = mkPackageOption pkgs "buffybox" { }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra CLI arguments to pass to buffyboard. + ''; + example = [ + "--geometry=1920x1080@640,0" + "--dpi=192" + "--rotate=2" + "--verbose" + ]; + }; + + configFile = mkOption { + type = lib.types.path; + default = ini.generate "buffyboard.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings); + defaultText = lib.literalExpression ''ini.generate "buffyboard.conf" cfg.settings''; + description = '' + Path to an INI format configuration file to provide Buffyboard. + By default, this is generated from whatever you've set in `settings`. + If specified manually, then `settings` is ignored. + + For an example config file see [here](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/master/buffyboard/buffyboard.conf) + ''; + }; + + settings = mkOption { + description = '' + Settings to include in /etc/buffyboard.conf. + Every option here is strictly optional: + Buffyboard will use its own baked-in defaults for those options left unset. + ''; + type = types.submodule { + freeformType = ini.type; + + options.input.pointer = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of a hardware mouse or other pointing device. + ''; + }; + options.input.touchscreen = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of the touchscreen. + ''; + }; + + options.theme.default = mkOption { + type = types.either types.str ( + types.enum [ + null + "adwaita-dark" + "breezy-dark" + "breezy-light" + "nord-dark" + "nord-light" + "pmos-dark" + "pmos-light" + ] + ); + default = null; + description = '' + Selects the default theme on boot. Can be changed at runtime to the alternative theme. + ''; + }; + options.quirks.fbdev_force_refresh = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + If true and using the framebuffer backend, this triggers a display refresh after every draw operation. + This has a negative performance impact. + ''; + }; + }; + default = { }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services.buffyboard = { + # upstream provides the service (including systemd hardening): we just configure it to start by default + # and override ExecStart so as to optionally pass extra arguments + serviceConfig.ExecStart = [ + "" # clear default ExecStart + (utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "buffyboard") + "--config-override" + cfg.configFile + ] + ++ cfg.extraFlags + )) + ]; + wantedBy = [ "getty.target" ]; + before = [ "getty.target" ]; + }; + }; +} diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 8256226041ea..edbfb6467ae7 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -13,7 +13,13 @@ let // lib.optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; } // lib.optionalAttrs (cfg.site != null) { site = cfg.site; } // lib.optionalAttrs (cfg.tags != null ) { tags = lib.concatStringsSep ", " cfg.tags; } - // lib.optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; } + // lib.optionalAttrs (cfg.enableLiveProcessCollection) { + process_config = { + dd_agent_bin = "${datadogPkg}/bin/agent"; + process_collection.enabled = "true"; + container_collection.enabled = "true"; + }; + } // lib.optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; } // cfg.extraConfig; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index be7d2f1b6b35..26a59c317d8e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -58,6 +58,7 @@ let "mikrotik" "modemmanager" "mongodb" + "mqtt" "mysqld" "nats" "nextcloud" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix new file mode 100644 index 000000000000..d1d6fcf6e2de --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix @@ -0,0 +1,140 @@ +{ + config, + lib, + pkgs, + options, + utils, +}: + +let + inherit (lib) + mkIf + mkEnableOption + mkOption + types + ; + cfg = config.services.prometheus.exporters.mqtt; + toConfigBoolean = x: if x then "True" else "False"; + toConfigList = builtins.concatStringsSep ","; +in +{ + # https://github.com/kpetremann/mqtt-exporter/tree/master?tab=readme-ov-file#configuration + port = 9000; + extraOpts = { + keepFullTopic = mkEnableOption "Keep entire topic instead of the first two elements only. Usecase: Shelly 3EM"; + logLevel = mkOption { + type = types.enum [ + "CRITICAL" + "ERROR" + "WARNING" + "INFO" + "DEBUG" + ]; + default = "INFO"; + example = "DEBUG"; + description = "Logging level"; + }; + logMqttMessage = mkEnableOption "Log MQTT original message, only if `LOG_LEVEL` is set to DEBUG."; + mqttIgnoredTopics = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Lists of topics to ignore. Accepts wildcards."; + }; + mqttAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "IP or hostname of MQTT broker."; + }; + mqttPort = mkOption { + type = types.port; + default = 1883; + description = "TCP port of MQTT broker."; + }; + mqttTopic = mkOption { + type = types.str; + default = "#"; + description = "Topic path to subscribe to."; + }; + mqttKeepAlive = mkOption { + type = types.int; + default = 60; + example = 30; + description = "Keep alive interval to maintain connection with MQTT broker."; + }; + mqttUsername = mkOption { + type = types.nullOr types.str; + default = null; + example = "mqttexporter"; + description = "Username which should be used to authenticate against the MQTT broker."; + }; + mqttV5Protocol = mkEnableOption "Force to use MQTT protocol v5 instead of 3.1.1."; + mqttClientId = mkOption { + type = types.nullOr types.str; + default = null; + description = "Set client ID manually for MQTT connection"; + }; + mqttExposeClientId = mkEnableOption "Expose the client ID as a label in Prometheus metrics."; + prometheusPrefix = mkOption { + type = types.str; + default = "mqtt_"; + description = "Prefix added to the metric name."; + }; + topicLabel = mkOption { + type = types.str; + default = "topic"; + description = "Define the Prometheus label for the topic."; + }; + zigbee2MqttAvailability = mkEnableOption "Normalize sensor name for device availability metric added by Zigbee2MQTT."; + zwaveTopicPrefix = mkOption { + type = types.str; + default = "zwave/"; + description = "MQTT topic used for Zwavejs2Mqtt messages."; + }; + esphomeTopicPrefixes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "MQTT topic used for ESPHome messages."; + }; + hubitatTopicPrefixes = mkOption { + type = types.listOf types.str; + default = [ "hubitat/" ]; + description = "MQTT topic used for Hubitat messages."; + }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = [ "/run/secrets/mqtt-exporter" ]; + description = '' + File to load as environment file. Useful for e.g. setting `MQTT_PASSWORD` + without putting any secrets into the Nix store. + ''; + }; + }; + serviceOpts = { + environment = { + KEEP_FULL_TOPIC = toConfigBoolean cfg.keepFullTopic; + LOG_LEVEL = cfg.logLevel; + LOG_MQTT_MESSAGE = toConfigBoolean cfg.logMqttMessage; + MQTT_IGNORED_TOPIC = toConfigList cfg.mqttIgnoredTopics; + MQTT_ADDRESS = cfg.mqttAddress; + MQTT_PORT = toString cfg.mqttPort; + MQTT_TOPIC = cfg.mqttTopic; + MQTT_KEEPALIVE = toString cfg.mqttKeepAlive; + MQTT_USERNAME = cfg.mqttUsername; + MQTT_V5_PROTOCOL = toConfigBoolean cfg.mqttV5Protocol; + MQTT_CLIENT_ID = mkIf (cfg.mqttClientId != null) cfg.mqttClientId; + PROMETHEUS_ADDRESS = cfg.listenAddress; + PROMETHEUS_PORT = toString cfg.port; + PROMETHEUS_PREFIX = cfg.prometheusPrefix; + TOPIC_LABEL = cfg.topicLabel; + ZIGBEE2MQTT_AVAILABILITY = toConfigBoolean cfg.zigbee2MqttAvailability; + ZWAVE_TOPIC_PREFIX = cfg.zwaveTopicPrefix; + ESPHOME_TOPIC_PREFIXES = toConfigList cfg.esphomeTopicPrefixes; + HUBITAT_TOPIC_PREFIXES = toConfigList cfg.hubitatTopicPrefixes; + }; + serviceConfig = { + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = lib.getExe pkgs.mqtt-exporter; + }; + }; +} diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 73fc210728d8..47b707f213f0 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -91,7 +91,7 @@ in ipv6 = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Whether to use IPv6."; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 09f271999fc4..82ece277f187 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -300,7 +300,7 @@ in { capabilities = mkOption { type = types.listOf types.str; - default = ["HT40" "HT40-" "SHORT-GI-20" "SHORT-GI-40"]; + default = ["HT40" "SHORT-GI-20" "SHORT-GI-40"]; example = ["LDPC" "HT40+" "HT40-" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1"]; description = '' HT (High Throughput) capabilities given as a list of flags. diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 78251b3721a7..543522c534b4 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) cups-pk-helper cups-filters xdg-utils; + inherit (pkgs) cups-pk-helper libcupsfilters cups-filters xdg-utils; cfg = config.services.printing; cups = cfg.package; @@ -35,7 +35,7 @@ let bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups.out additionalBackends cups-filters pkgs.ghostscript ] + [ cups.out additionalBackends libcupsfilters cups-filters pkgs.ghostscript ] ++ cfg.drivers; pathsToLink = [ "/lib" "/share/cups" "/bin" ]; postBuild = cfg.bindirCmds; @@ -278,6 +278,8 @@ in ''; }; + browsed.package = lib.mkPackageOption pkgs "cups-browsed" {}; + browsedConf = mkOption { type = types.lines; default = ""; @@ -436,7 +438,7 @@ in path = [ cups ]; - serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed"; + serviceConfig.ExecStart = "${cfg.browsed.package}/bin/cups-browsed"; restartTriggers = [ browsedFile ]; }; diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 870ae58f8646..c96bc5adf1cf 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -41,6 +41,8 @@ in { ''; }; + options.services.cage.package = mkPackageOption pkgs "cage" { }; + config = mkIf cfg.enable { # The service is partially based off of the one provided in the @@ -64,7 +66,7 @@ in { unitConfig.ConditionPathExists = "/dev/tty1"; serviceConfig = { ExecStart = '' - ${pkgs.cage}/bin/cage \ + ${cfg.package}/bin/cage \ ${escapeShellArgs cfg.extraArguments} \ -- ${cfg.program} ''; diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 3185f9a4263c..11608418e978 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -204,7 +204,6 @@ in }; "/" = { # mixed frontend and backend requests, based on the request headers - recommendedProxySettings = true; extraConfig = '' set $proxpass "${ui}"; if ($http_accept = "application/activity+json") { @@ -221,6 +220,11 @@ in rewrite ^(.+)/+$ $1 permanent; proxy_pass $proxpass; + # Proxied `Host` header is required to validate ActivityPub HTTP signatures for incoming events. + # The other headers are optional, for the sake of better log data. + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 420346d1a7e8..77f18615b2b3 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -135,6 +135,17 @@ in }; environment.systemPackages = with pkgs; ([ + # Teach nemo-desktop how to launch file browser. + # https://github.com/linuxmint/nemo/blob/6.4.0/src/nemo-desktop-application.c#L398 + (writeTextFile { + name = "x-cinnamon-mimeapps"; + destination = "/share/applications/x-cinnamon-mimeapps.list"; + text = '' + [Default Applications] + inode/directory=nemo.desktop + ''; + }) + desktop-file-utils # common-files diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 87876867c572..c07a09d701f6 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -761,6 +761,7 @@ in lib.nameValuePair "zfs-sync-${pool}" { description = "Sync ZFS pool \"${pool}\""; wantedBy = [ "shutdown.target" ]; + before = [ "final.target" ]; unitConfig = { DefaultDependencies = false; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ba48ae769be7..e80487573580 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -563,6 +563,7 @@ in { lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; + lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix; lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; diff --git a/nixos/tests/apparmor.nix b/nixos/tests/apparmor.nix index be91e9632849..f75c0c72718d 100644 --- a/nixos/tests/apparmor.nix +++ b/nixos/tests/apparmor.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... } : { name = "apparmor"; - meta.maintainers = with lib.maintainers; [ julm ]; + meta.maintainers = with lib.maintainers; [ julm grimmauld ]; nodes.machine = { lib, pkgs, config, ... }: diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix new file mode 100644 index 000000000000..b4ac5dd4ad2a --- /dev/null +++ b/nixos/tests/lomiri-mediaplayer-app.nix @@ -0,0 +1,77 @@ +{ lib, ... }: +let + ocrContent = "Video Test"; + videoFile = "test.webm"; +in +{ + name = "lomiri-mediaplayer-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + # Setup video + etc."${videoFile}".source = + pkgs.runCommand videoFile + { + nativeBuildInputs = with pkgs; [ + ffmpeg # produce video for OCR + (imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able image + ]; + } + '' + magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png + ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal + ''; + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-mediaplayer-app + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("lomiri mediaplayer launches"): + machine.succeed("lomiri-mediaplayer-app >&2 &") + machine.wait_for_text("Choose from") + machine.screenshot("lomiri-mediaplayer_open") + + machine.succeed("pkill -f lomiri-mediaplayer-app") + + with subtest("lomiri mediaplayer plays video"): + machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &") + machine.wait_for_text("${ocrContent}") + machine.screenshot("lomiri-mediaplayer_playback") + + machine.succeed("pkill -f lomiri-mediaplayer-app") + + with subtest("lomiri mediaplayer localisation works"): + # OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated + # Cause an error, and look for the error popup + machine.succeed("touch invalid.mp4") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &") + machine.wait_for_text("Fehler") + machine.screenshot("lomiri-mediaplayer_localised") + ''; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4aacd8e5a849..6ea841b4d9ea 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -804,6 +804,38 @@ let ''; }; + mqtt = { + exporterConfig = { + enable = true; + environmentFile = pkgs.writeText "mqtt-exporter-envfile" '' + MQTT_PASSWORD=testpassword + ''; + }; + metricProvider = { + services.mosquitto = { + enable = true; + listeners = [{ + users.exporter = { + acl = [ "read #" ]; + passwordFile = pkgs.writeText "mosquitto-password" "testpassword"; + }; + }]; + }; + systemd.services.prometheus-mqtt-exporter ={ + wants = [ "mosquitto.service" ]; + after = [ "mosquitto.service" ]; + }; + }; + exporterTest = '' + wait_for_unit("mosquitto.service") + wait_for_unit("prometheus-mqtt-exporter.service") + wait_for_open_port(9000) + succeed( + "curl -sSf http://localhost:9000/metrics | grep '^python_info'" + ) + ''; + }; + mysqld = { exporterConfig = { enable = true; diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index 00c442e7f58c..8cb57f200d2e 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -22,7 +22,7 @@ , libcdio-paranoia, withCD ? true , keybinder3, withKeybinder ? false , libnotify, withLibnotify ? false -, libsoup, withLibsoup ? false +, libsoup_2_4, withLibsoup ? false , libgudev, withGudev ? false # experimental , libmtp, withMtp ? false # experimental , xfce, withXfce4ui ? false @@ -73,7 +73,7 @@ mkDerivation rec { ++ lib.optional withLibnotify libnotify ++ lib.optional withLastfm liblastfmSF ++ lib.optional withGlyr glyr - ++ lib.optional withLibsoup libsoup + ++ lib.optional withLibsoup libsoup_2_4 ++ lib.optional withMtp libmtp ++ lib.optional withXfce4ui xfce.libxfce4ui ++ lib.optional withTotemPlParser totem-pl-parser diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 7a0063238d49..ee2b4f8a842b 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,8 +20,7 @@ libappindicator-gtk3, libmodplug, librsvg, - libsoup, - webkitgtk_4_0, + libsoup_3, # optional features withDbusPython ? false, @@ -89,8 +88,7 @@ python3.pkgs.buildPythonApplication { keybinder3 libappindicator-gtk3 libmodplug - libsoup - webkitgtk_4_0 + libsoup_3 ] ++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withGstreamerBackend) ( diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 85a3295fb064..9c6de88703b3 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,32 +1,36 @@ -{ callPackage -, timeshift-unwrapped -, rsync -, coreutils -, mount -, umount -, psmisc -, cron -, btrfs-progs -, grubPackage +{ + callPackage, + btrfs-progs, + coreutils, + cron, + grubPackage, + mount, + psmisc, + rsync, + timeshift-unwrapped, + umount, }: let timeshift-wrapper = callPackage ./wrapper.nix { }; in -(timeshift-wrapper timeshift-unwrapped ([ - rsync - coreutils - mount - umount - psmisc - cron +(timeshift-wrapper timeshift-unwrapped [ btrfs-progs + coreutils + cron grubPackage -])).overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { - description = oldAttrs.meta.description; - longDescription = oldAttrs.meta.longDescription + '' - This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and (optionally) btrfs. - If you want to use the commands provided by the system, override the propagatedBuildInputs or use timeshift-minimal instead - ''; - }; -}) + mount + psmisc + rsync + umount +]).overrideAttrs + (oldAttrs: { + meta = oldAttrs.meta // { + description = oldAttrs.meta.description; + longDescription = + oldAttrs.meta.longDescription + + '' + This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs. + If you want to use the commands provided by the system, use timeshift-minimal instead. + ''; + }; + }) diff --git a/pkgs/applications/backup/timeshift/minimal.nix b/pkgs/applications/backup/timeshift/minimal.nix index 96946fa72e05..113200c30e73 100644 --- a/pkgs/applications/backup/timeshift/minimal.nix +++ b/pkgs/applications/backup/timeshift/minimal.nix @@ -1,5 +1,6 @@ -{ callPackage -, timeshift-unwrapped +{ + callPackage, + timeshift-unwrapped, }: let timeshift-wrapper = callPackage ./wrapper.nix { }; @@ -7,9 +8,11 @@ in (timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { description = oldAttrs.meta.description + " (without runtime dependencies)"; - longDescription = oldAttrs.meta.longDescription + '' - This package is a wrapped version of timeshift-unwrapped - without runtime dependencies of command utilities. - ''; + longDescription = + oldAttrs.meta.longDescription + + '' + This package is a wrapped version of timeshift-unwrapped + without runtime dependencies of command utilities. + ''; }; }) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 534145c19cbe..3fbaed4b21be 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -1,29 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, gettext -, help2man -, meson -, ninja -, pkg-config -, vala -, gtk3 -, json-glib -, libgee -, util-linux -, vte -, xapp +{ + lib, + stdenv, + fetchFromGitHub, + gettext, + help2man, + meson, + ninja, + pkg-config, + vala, + gtk3, + json-glib, + libgee, + util-linux, + vte, + xapp, }: stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.3"; + version = "24.06.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-npYiUSAPzr6g29ilQ1JELxqR1VbOR7TNMkdx37n92kk="; + hash = "sha256-2qNLgUZLMcfoemdLvvjdkR7Ln5loSKGqbd402y5Id8k="; }; patches = [ @@ -65,6 +66,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/timeshift"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ShamrockLee bobby285271 ]; + maintainers = with maintainers; [ + ShamrockLee + bobby285271 + ]; }; } diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index 84b3f14ac2ff..5bbfffb94d46 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -1,22 +1,22 @@ -{ stdenvNoCC -, lib -, wrapGAppsHook3 -, gdk-pixbuf -, librsvg -, xorg -, shared-mime-info +{ + stdenvNoCC, + lib, + wrapGAppsHook3, + gdk-pixbuf, + librsvg, + xorg, + shared-mime-info, }: -timeshift-unwrapped: -runtimeDeps: +timeshift-unwrapped: runtimeDeps: stdenvNoCC.mkDerivation { inherit (timeshift-unwrapped) pname version; dontUnpack = true; nativeBuildInputs = [ - xorg.lndir wrapGAppsHook3 + xorg.lndir ]; installPhase = '' @@ -34,7 +34,13 @@ stdenvNoCC.mkDerivation { ) gappsWrapperArgs+=( # Thumbnailers - --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ gdk-pixbuf librsvg shared-mime-info ]}" + --prefix XDG_DATA_DIRS : "${ + lib.makeSearchPath "share" [ + gdk-pixbuf + librsvg + shared-mime-info + ] + }" "''${makeWrapperArgs[@]}" ) wrapProgram "$out/bin/timeshift" "''${makeWrapperArgs[@]}" diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 868ffaf6e0cd..3c669592c0dd 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -11,16 +11,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-yp9fKD7zH9Ne2+WQUupaxvUx39RWE8RdY4U6lHuDGSc="; + hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ="; }; - cargoHash = "sha256-J+6aek1PcW7G6f4h6cQcx5CyliryZeSxkSIQUX3yz6s="; + cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix index c97d3cc2d491..f8c2a6c6aafe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -7,13 +7,13 @@ melpaBuild { pname = "isearch-prop"; - version = "0-unstable-2022-12-30"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "isearch-prop"; - rev = "5787fd57977c0d6c416ce71471c3b9da246dfb78"; - hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA="; + rev = "7b32697c16541036abadbbb4d65dd67a4f1d2812"; + hash = "sha256-NmFkbxiRFAqi1TaOFfmAOgIs1QZMKXkJfMmXL9fsV14="; }; passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix index 3d061ddb45cc..d78502333229 100644 --- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -7,12 +7,12 @@ nix-update-script, }: let - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; rev = "refs/tags/v${version}"; - hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI="; + hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI="; }; libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; blink-fuzzy-lib = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a6b06aa7dc53..3a2587e06b1c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1037,6 +1037,18 @@ final: prev: meta.homepage = "https://github.com/yetone/avante.nvim/"; }; + aw-watcher-vim = buildVimPlugin { + pname = "aw-watcher-vim"; + version = "2023-10-09"; + src = fetchFromGitHub { + owner = "ActivityWatch"; + repo = "aw-watcher-vim"; + rev = "4ba86d05a940574000c33f280fd7f6eccc284331"; + sha256 = "0kzpr2dgn80lcqbbf9ig6vx7azz6vbvadi31mxb0qyd91fyiidi3"; + }; + meta.homepage = "https://github.com/ActivityWatch/aw-watcher-vim/"; + }; + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2024-05-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b5ff7ce37fef..427732414a7a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -258,6 +258,15 @@ in } ); + aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/aw-watcher-vim/program_paths.patch; + curl = lib.getExe curl; + }) + ]; + }; + bamboo-nvim = super.bamboo-nvim.overrideAttrs { nvimSkipModule = [ # Requires config table diff --git a/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch new file mode 100644 index 000000000000..857327664108 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch @@ -0,0 +1,13 @@ +diff --git a/plugin/activitywatch.vim b/plugin/activitywatch.vim +index 6986553..7462b02 100644 +--- a/plugin/activitywatch.vim ++++ b/plugin/activitywatch.vim +@@ -29,7 +29,7 @@ let s:heartbeat_apiurl = printf('%s/heartbeat?pulsetime=30', s:bucket_apiurl) + let s:http_response_code = {} + + function! HTTPPostJson(url, data) +- let l:req = ['curl', '-s', a:url, ++ let l:req = ['@curl@', '-s', a:url, + \ '-H', 'Content-Type: application/json', + \ '-X', 'POST', + \ '-d', json_encode(a:data), diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c3b0a65a95dd..c03e75e9845b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2312,8 +2312,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "2.2.2"; - hash = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q="; + version = "2.4.4"; + hash = "sha256-O7tfZ1bQmlMgZGoWuECjSno6DLCO0+CCteRhT6PjZBY="; }; meta = { license = lib.licenses.mit; @@ -2706,8 +2706,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.3.1"; - hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI="; + version = "0.3.5"; + hash = "sha256-hiyFZVsZkxpc2Kh0zi3NGwA/FUbetAS9khWxYesxT4s="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index c27830e2cac3..19f8a59e37ec 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -48,7 +48,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { + lib.optionalString pythonUseFixed '' # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. substituteInPlace "./package.json" \ - --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" + --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\"" ''; passthru.updateScript = writeScript "update" '' diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index eb8db3fd45f6..e22d5a13f56d 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-dHxeyqVe7cA/xK0RpprWRt5xPViyLHHal0pO6xhq4aE="; + hash = "sha256-vkVH+CBGSEWqSIDel+Y2O+B17LvLZbOjpHzbGAvEmWg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index a79b3ec37db7..3068cfecdaca 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.13.0"; + version = "0.13.1"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-mhfn/Lw/W1T2PaIglwrO/7VacDutT6Tgs133ePHL7W4="; + hash = "sha256-vKlsRxqtEvx4Gu6tkBjERYHl4Xx0K9xnYkh1SMDOYl0="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-feghMmcqzFM/Ttk8s4fp8et9Suw2kKLocptzwEcB2Sw="; + hash = "sha256-hzKZYPL/ZCRP2a4EaZGRXmzVpUNlGh4gOQt7NvGkn4M="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-bfBj/A41FFMwMAEVw77nEDyk0+fYvi2Tg1Ufihxi9F8="; + hash = "sha256-nvVeme/qRG1ObSeisIBQHka5zG2f7Bqsjmva5EevXxw="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-xzf3WrH7BTiaX6NC2n9nLCKuBlFzRDYaSR73VGM7Ldc="; + hash = "sha256-mW6zJq0XvliCAWuslHdnlMX7bgO0mS9kH7CIYXjlaCE="; }; }; in diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index dc12dc2da62e..a7cc9b5ea6a3 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.10.01"; + version = "2024.12.04"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-qfrEy7OndhJ/UnfFDCp7qlIhYWANkUBy2ejYVvRrG3k="; + hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 6d3ac4f66296..b809a85a079b 100644 --- a/pkgs/applications/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { mainProgram = "winetricks"; license = lib.licenses.lgpl21; homepage = "https://github.com/Winetricks/winetricks"; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6dac49fc5d15..f8ee5bf288d0 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eddy"; - version = "1.2.1"; + version = "3.6"; src = fetchFromGitHub { owner = "obdasystems"; repo = pname; - rev = "v${version}"; - sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-vRmLUIqU0qfcnKzymBGb9gfM/uQiAcUHUnyz8iH/GrM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 62f485ff916e..d80b7e820261 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -27,7 +27,7 @@ , librevenge , librsvg , libsigcxx -, libsoup +, libsoup_2_4 , libvisio , libwpg , libXft @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { librevenge librsvg # for loading icons libsigcxx - libsoup + libsoup_2_4 libvisio libwpg libXft diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix deleted file mode 100644 index 7f618b257387..000000000000 --- a/pkgs/applications/graphics/xournal/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, makeDesktopItem -, ghostscript, atk, gtk2, glib, fontconfig, freetype -, libgnomecanvas -, pango, libX11, xorgproto, zlib, poppler -, autoconf, automake, libtool, pkg-config}: - -let - isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); -in - -stdenv.mkDerivation rec { - version = "0.4.8.2016"; - pname = "xournal"; - src = fetchurl { - url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz"; - sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j"; - }; - - buildInputs = [ - ghostscript atk gtk2 glib fontconfig freetype - libgnomecanvas - pango libX11 xorgproto zlib poppler - ]; - - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - NIX_LDFLAGS = "-lz" - + lib.optionalString (!isGdkQuartzBackend) " -lX11"; - - desktopItem = makeDesktopItem { - name = "xournal-${version}"; - exec = "xournal"; - icon = "xournal"; - desktopName = "Xournal"; - comment = meta.description; - categories = [ "Office" "Graphics" ]; - mimeTypes = [ "application/pdf" "application/x-xoj" ]; - genericName = "PDF Editor"; - }; - - postInstall='' - mkdir --parents $out/share/mime/packages - cat << EOF > $out/share/mime/packages/xournal.xml - - - Xournal Document - - - - EOF - cp --recursive ${desktopItem}/share/applications $out/share - mkdir --parents $out/share/icons - cp $out/share/xournal/pixmaps/xournal.png $out/share/icons - ''; - - meta = with lib; { - homepage = "https://xournal.sourceforge.net/"; - description = "Note-taking application (supposes stylus)"; - maintainers = [ maintainers.guibert ]; - license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; - mainProgram = "xournal"; - }; -} diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 64ce75717edb..84b619911d9b 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk="; + hash = "sha256-Hm3NDVELOnwjg6NiV5VBbt/15slHAgOVZLTV3zBMkLI="; }; postPatch = '' diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 60bc8b579237..6212751184b0 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.26"; + version = "13.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; + hash = "sha256-wz5cYZe7OHfIgoHrYRj0DKNFjYjb+CGlLnDItRNu+bk="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d4259c2895ad..bdedac20c5eb 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -84,6 +84,8 @@ mkChromiumDerivation (base: rec { homepage = if ungoogled then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; + # Maintainer pings for this derivation are highly unreliable. + # If you add yourself as maintainer here, please also add yourself as CODEOWNER. maintainers = with lib.maintainers; if ungoogled then [ networkexception emilylange ] else [ networkexception emilylange ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4a16de319a1e..c0a661a86038 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -663,12 +663,7 @@ let } // lib.optionalAttrs (!isElectron) { inherit chromiumDeps npmDeps; }; - } - # overwrite `version` with the exact same `version` from the same source, - # except it internally points to `upstream-info.nix` for - # `builtins.unsafeGetAttrPos`, which is used by ofborg to decide - # which maintainers need to be pinged. - // builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info)); + }; # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4f0255210d31..296c35021280 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -178,9 +178,3 @@ in stdenv.mkDerivation { inherit sandboxExecutableName; }; } -# the following is a complicated and long-winded variant of -# `inherit (chromium.browser) version`, with the added benefit -# that it keeps the pointer to upstream-info.nix for -# builtins.unsafeGetAttrPos, which is what ofborg uses to -# decide which maintainers need to be pinged. -// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser)) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 618730284074..5906d5749b44 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,7 +766,7 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.85", + "version": "131.0.6778.108", "deps": { "depot_tools": { "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", @@ -777,16 +777,16 @@ "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" }, "ungoogled-patches": { - "rev": "131.0.6778.85-1", - "hash": "sha256-mcSshjdfUEH4ur4z+0P0oWCjlV8EhFMc+7rdfIIPASI=" + "rev": "131.0.6778.108-1", + "hash": "sha256-xFtxgZRbtG8qxvTyt++wa69dQvr61K29mTubkxoI1Y8=" }, "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "3d81e41b6f3ac8bcae63b32e8145c9eb0cd60a2d", - "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=", + "rev": "3b014839fbc4fb688b2f5af512d6ce312ad208b1", + "hash": "sha256-ypzu3LveMFcOFm7+JlaERjzs3SK/n9+sfm5wOKB8/zw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -886,8 +886,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "7e742cac42c29a14ab7f54b134b2f17592711267", - "hash": "sha256-K2gwKNwonzCIu4hnlYuOaYyKaRV11hwDzF4oykiKsl0=" + "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", + "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1366,8 +1366,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "94631d9b9a10697325589e1642af63a0137cac94", - "hash": "sha256-SKKLOxjimQWt8W+Q3wlCJaUC/lxw6EIZDFBuVQKmnVY=" + "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", + "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1491,8 +1491,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "8445abdf8069cadcbd134369b70d0ebd436ef477", - "hash": "sha256-EitEjXNtm0gB9wtAwIYHBHkU7paHg5zvsTz171hRmK4=" + "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", + "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "bd2671b973062afc614b852ec190524b80aaef8a", - "hash": "sha256-uq0CE7Chqzy2d+iifC3hV9RTnDVinpwjl1pOzyNGbSo=" + "rev": "e38771cb283b9689683c5ac0b5831dd89f8ec690", + "hash": "sha256-csSDnepYxil0R3PD/LVxW7JBcasOKG4l6q6vj8zHV/I=" } } } diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 73bad4378dca..c6b2cd3e1e5d 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -29,26 +29,31 @@ const flush_to_file_proxy = { }, } const lockfile = new Proxy(structuredClone(lockfile_initial), flush_to_file_proxy) - +const ungoogled_rev = argv['ungoogled-chromium-rev'] for (const attr_path of Object.keys(lockfile)) { - if (!argv[attr_path]) { + const ungoogled = attr_path === 'ungoogled-chromium' + + if (!argv[attr_path] && !(ungoogled && ungoogled_rev)) { console.log(`[${attr_path}] Skipping ${attr_path}. Pass --${attr_path} as argument to update.`) continue } - const ungoogled = attr_path === 'ungoogled-chromium' const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps['ungoogled-patches'].rev - const version_upstream = !ungoogled ? await get_latest_chromium_release() : await get_latest_ungoogled_release() + const version_upstream = !ungoogled ? await get_latest_chromium_release() : + ungoogled_rev ?? await get_latest_ungoogled_release() console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`) console.log(`[${attr_path}] ${chalk.green(version_upstream)} (upstream)`) - if (version_greater_than(version_upstream, version_nixpkgs)) { + if (ungoogled_rev || version_greater_than(version_upstream, version_nixpkgs)) { console.log(`[${attr_path}] ${chalk.green(version_upstream)} from upstream is newer than our ${chalk.red(version_nixpkgs)}...`) - // unconditionally remove ungoogled-chromium's epoch/sub-version (e.g. 130.0.6723.116-1 -> 130.0.6723.116) - const version_chromium = version_upstream.split('-')[0] + let ungoogled_patches = ungoogled ? await fetch_ungoogled(version_upstream) : undefined + + // For ungoogled-chromium we need to remove the patch revision (e.g. 130.0.6723.116-1 -> 130.0.6723.116) + // by just using the chromium_version.txt content from the patches checkout (to also work with commit revs). + const version_chromium = ungoogled_patches?.chromium_version ?? version_upstream const chromium_rev = await chromium_resolve_tag_to_rev(version_chromium) @@ -58,7 +63,10 @@ for (const attr_path of Object.keys(lockfile)) { deps: { depot_tools: {}, gn: {}, - 'ungoogled-patches': ungoogled ? await fetch_ungoogled(version_upstream) : undefined, + 'ungoogled-patches': !ungoogled ? undefined : { + rev: ungoogled_patches.rev, + hash: ungoogled_patches.hash, + }, npmHash: dummy_hash, }, DEPS: {}, @@ -187,13 +195,19 @@ async function fetch_ungoogled(rev) { const expr = (hash) => [`(import ./. {}).fetchFromGitHub { owner = "ungoogled-software"; repo = "ungoogled-chromium"; rev = "${rev}"; hash = "${hash}"; }`] const hash = await prefetch_FOD('--expr', expr('')) - const checkout = await $nixpkgs`nix-build --expr ${expr(hash)}` + const checkout = await $nixpkgs`nix-build --expr ${expr(hash)}` + const checkout_path = checkout.stdout.trim() - await fs.copy(`${checkout.stdout.trim()}/flags.gn`, './ungoogled-flags.toml') + await fs.copy(path.join(checkout_path, 'flags.gn'), './ungoogled-flags.toml') + + const chromium_version = (await fs.readFile(path.join(checkout_path, 'chromium_version.txt'))).toString().trim() + + console.log(`[ungoogled-chromium] ${chalk.green(rev)} patch revision resolves to chromium version ${chalk.green(chromium_version)}`) return { rev, hash, + chromium_version, } } diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 4fa6b759929d..07b2b8049431 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.4.1"; + version = "33.5.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc="; + hash = "sha256-TlmDsZKHolTS+y+1BymyY49+AvqUv8zmUXCGNHCRPL0="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA="; + hash = "sha256-f6vLHbpmvVfkjZr7x0DiCFoGGvfxHfFZ3KTagq2Mwp4="; }; }; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 990036a8045e..3e98ff068c97 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook3 -, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0 +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup_2_4, webkitgtk_4_0 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib-networking gsettings-desktop-schemas gtk - libsoup + libsoup_2_4 webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0972fcfdc0ff..eec438606279 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=", + "hash": "sha256-q2Ougw8U6kapeGWBLhsvrRMW8/kGhE0eTV35kPHrN5g=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.6.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" + "vendorHash": "sha256-51bLi7cqy7iUt9Aocog7OOKYWSdGbQEoZzasUpDuHu4=" }, "argocd": { "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", @@ -552,13 +552,13 @@ "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=", + "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.48.1", + "rev": "v1.49.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" + "vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg=" }, "helm": { "hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=", @@ -651,13 +651,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=", + "hash": "sha256-Dva5bFyJpxifsQl62xnjvqEQ5SknUmCLfGX4fFx5FAE=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.4", + "rev": "v0.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes=" + "vendorHash": "sha256-xr54yCVGOJbj0612wiljUkx1wEOSuXB1qrGbF/vCwN8=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-HJ+QlbmMvn45l9KjmVzoK/jETIosOSlcLtw4B1kdEIo=", + "hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.16.1", + "rev": "v1.19.0", "spdx": "MIT", - "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" + "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { "hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=", diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 0116680f01eb..5c0ca836eab7 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-10-13"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "26b77d9385daa2dc056930fa302a3c06595680ba"; - hash = "sha256-zXqYj8IBDVeDKjm0m8CYEX+tmHLpY2u7A4g38IiDNZk="; + rev = "3286ebecaab3c05ddbab9e6b502a750d07cea5aa"; + hash = "sha256-DaD6Rv/dzky3gjjqtjObTFZp7EJ8+UK6CoFpqZ/HO9U="; }; - vendorHash = "sha256-68NGcdyKuabSdW6CKAJUaJ0k2dpO0bm3OfNQ7qEVcqk="; + vendorHash = "sha256-66Y5hmEEQUBsSfYaj6UzCsFhDkwCDs6y2WOsnYby1gE="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index dd5f8f54c745..147db575ae63 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -3,7 +3,7 @@ , vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita -, libnotify, libsoup, libgee +, libnotify, libsoup_2_4, libgee , libsignal-protocol-c , libgcrypt , sqlite @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify gpgme libgcrypt - libsoup + libsoup_2_4 pcre2 icu libsignal-protocol-c @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" - "-DSOUP_VERSION=${lib.versions.major libsoup.version}" + "-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 40e1b478bad9..ad0939f8f27c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,16 +10,16 @@ let if stdenv.hostPlatform.isLinux then { stable = "0.0.76"; - ptb = "0.0.118"; - canary = "0.0.528"; - development = "0.0.50"; + ptb = "0.0.121"; + canary = "0.0.535"; + development = "0.0.53"; } else { - stable = "0.0.327"; - ptb = "0.0.148"; - canary = "0.0.639"; - development = "0.0.65"; + stable = "0.0.328"; + ptb = "0.0.151"; + canary = "0.0.647"; + development = "0.0.67"; }; version = versions.${branch}; srcs = rec { @@ -30,33 +30,33 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-msheT6PXTkIq7EwowYwL7g0kgOdLBZHeI5w2kijJUtw="; + hash = "sha256-Zaf6Pg6xeSyiIFJMlT+VkE/sXJULSqGzGHmK5MpBuhg="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-ajQHWSpjpuadFlT5WVXsSZf5Ng8ta4SyGbZp7TTb+8Q="; + hash = "sha256-YUuqkhb04nTTdL6W6VB0ampp3qEi0Gj5iz3lCt7AfMA="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-Ygwneo9GY1iVKBl3y6jSj81sexUsSY2J7i/DKxmJJyA="; + hash = "sha256-4FxdZsVTQTr5yzuzV6IZYZ6qk7sa9WZ27zCtVA1/uOg="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-5XzjJv2IebVMVml/e+VTVKrlbHTCj+t0lYsq1CwvLi0="; + hash = "sha256-yYQHoBv3Cco07WQhS8+BruV1gjGZti+bTS+jlRg0u14="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-YW6wgiplt+ue59i5+2Ap5tVAEhO1xgeP8jVOffkSWj4="; + hash = "sha256-R8R3r2i/+ru+82OBGBmF+Kn502RK/64VwtbdRVSwj0g="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-C+2Cr8D2ZqfdRp0m996p8HvOjkPzN82ywgbx2KMBqAE="; + hash = "sha256-GbR6XLK+2jBHGdvWeZv3HXbCr4mylBrdY/3rCFCkeCY="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-IckTw2wKTwGMGvQAOYG85yU1w9E6PdWA1G0f2BaXJ1Q="; + hash = "sha256-nyOQhSjlARvIjFc3uDi7IFtKxxIpO/V6M1eIg56dMdU="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 015a723d116a..fc39b4ce622f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 -, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 +, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { libpng12 libpulseaudio libsecret - libsoup + libsoup_2_4 libvorbis libxml2 llvmPackages_12.libunwind diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 911ed9715320..16c2652be526 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -6,7 +6,7 @@ , libofx , intltool , wrapGAppsHook3 -, libsoup +, libsoup_2_4 , adwaita-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gtk libgsf libofx - libsoup + libsoup_2_4 adwaita-icon-theme ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 75bd2278d606..550b3296dc00 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -62,6 +62,7 @@ let url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz"; sha256 = "sha256-UOc5WrG8KgAA3xJsaSCjbdPE7gSnFJay9MEK31DWUXg="; }; + gtest = fetchurl { url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz"; sha256 = "sha256-WKb0J3yivIVlIis7vVihd2CenEiOinJkk1m6UUUNt9g="; @@ -69,7 +70,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version; outputs = [ "out" "dev" "doc" ]; @@ -132,32 +133,39 @@ stdenv.mkDerivation rec { ++ lib.optional opencvSupport opencv; cmakeFlags = let - enableIf = cond: if cond then "ON" else "OFF"; excludeTestsRegex = lib.concatStringsSep "|" [ - # sporadic segfault + # segfault + "SerializationXML" "TrainedModelSerialization" # broken by openblas 0.3.21 "mathematics_lapack" + # fails on aarch64 + "LinearTimeMMD" + "QuadraticTimeMMD" + "SGVectorTest" + "Statistics" + # hangs on aarch64 + "PRange" # these take too long on CI "evaluation_cross_validation" "modelselection_combined_kernel" "modelselection_grid_search" ]; in [ - "-DBUILD_META_EXAMPLES=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'${excludeTestsRegex}'" - "-DENABLE_TESTING=${enableIf doCheck}" - "-DDISABLE_META_INTEGRATION_TESTS=ON" - "-DTRAVIS_DISABLE_META_CPP=ON" - "-DINTERFACE_PYTHON=${enableIf pythonSupport}" - "-DOpenCV=${enableIf opencvSupport}" - "-DUSE_SVMLIGHT=${enableIf withSvmLight}" + (lib.cmakeBool "BUILD_META_EXAMPLES" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPACK" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPREC" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_CPLEX" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_Mosek" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true) + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'") + (lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true) + (lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true) + (lib.cmakeBool "INTERFACE_PYTHON" pythonSupport) + (lib.cmakeBool "OpenCV" opencvSupport) + (lib.cmakeBool "USE_SVMLIGHT" withSvmLight) ]; CXXFLAGS = "-faligned-new"; @@ -196,7 +204,7 @@ stdenv.mkDerivation rec { postFixup = '' # CMake incorrectly calculates library path from dev prefix substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/" + --replace-fail "\''${_IMPORT_PREFIX}/lib/" "$out/lib/" ''; meta = with lib; { @@ -205,4 +213,4 @@ stdenv.mkDerivation rec { license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo smancill ]; }; -} +}) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 9878b425329b..74a75ce57871 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,30 +1,34 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, qemu -, sigtool -, makeWrapper -, nix-update-script -, apple-sdk_15 +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + qemu, + sigtool, + makeWrapper, + nix-update-script, + apple-sdk_15, + lima, }: buildGoModule rec { pname = "lima"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "lima-vm"; - repo = pname; + repo = "lima"; rev = "v${version}"; - sha256 = "sha256-XYB8Nxbs76xmiiZ7IYfgn+UgUr6CLOalQrl6Ibo+DRc="; + hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; - vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho="; + vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; - nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; @@ -48,23 +52,34 @@ buildGoModule rec { export LIMA_HOME="$(mktemp -d)" ''; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r _output/* $out - wrapProgram $out/bin/limactl \ - --prefix PATH : ${lib.makeBinPath [ qemu ]} - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) \ - --fish <($out/bin/limactl completion fish) \ - --zsh <($out/bin/limactl completion zsh) - '' + '' - runHook postInstall - ''; + installPhase = + '' + runHook preInstall + mkdir -p $out + cp -r _output/* $out + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + '' + + '' + runHook postInstall + ''; doInstallCheck = true; + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52 + # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' + if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi USER=nix $out/bin/limactl validate templates/default.yaml ''; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index af1d4cd97072..3a340c4766c4 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -1,32 +1,34 @@ -{ lib -, stdenv -, callPackage -, runCommandLocal -, writeShellScript -, glibc -, pkgsHostTarget -, runCommandCC -, coreutils -, bubblewrap +{ + lib, + stdenv, + callPackage, + runCommandLocal, + writeShellScript, + glibc, + pkgsHostTarget, + runCommandCC, + coreutils, + bubblewrap, }: -{ runScript ? "bash" -, nativeBuildInputs ? [] -, extraInstallCommands ? "" -, meta ? {} -, passthru ? {} -, extraPreBwrapCmds ? "" -, extraBwrapArgs ? [] -, unshareUser ? false -, unshareIpc ? false -, unsharePid ? false -, unshareNet ? false -, unshareUts ? false -, unshareCgroup ? false -, privateTmp ? false -, dieWithParent ? true -, ... -} @ args: +{ + runScript ? "bash", + nativeBuildInputs ? [ ], + extraInstallCommands ? "", + meta ? { }, + passthru ? { }, + extraPreBwrapCmds ? "", + extraBwrapArgs ? [ ], + unshareUser ? false, + unshareIpc ? false, + unsharePid ? false, + unshareNet ? false, + unshareUts ? false, + unshareCgroup ? false, + privateTmp ? false, + dieWithParent ? true, + ... +}@args: assert (!args ? pname || !args ? version) -> (args ? name); # You must provide name if pname or version (preferred) is missing. @@ -49,59 +51,82 @@ let name = args.name or "${args.pname}-${args.version}"; executableName = args.pname or args.name; # we don't know which have been supplied, and want to avoid defaulting missing attrs to null. Passed into runCommandLocal - nameAttrs = lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" ]) args; + nameAttrs = lib.filterAttrs ( + key: value: + builtins.elem key [ + "name" + "pname" + "version" + ] + ) args; buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - fhsenv = buildFHSEnv (removeAttrs args [ - "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" - "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" - ]); + fhsenv = buildFHSEnv ( + removeAttrs args [ + "runScript" + "extraInstallCommands" + "meta" + "passthru" + "extraPreBwrapCmds" + "extraBwrapArgs" + "dieWithParent" + "unshareUser" + "unshareCgroup" + "unshareUts" + "unshareNet" + "unsharePid" + "unshareIpc" + "privateTmp" + ] + ); - etcBindEntries = let - files = [ - # NixOS Compatibility - "static" - "nix" # mainly for nixUnstable users, but also for access to nix/netrc - # Shells - "shells" - "bashrc" - "zshenv" - "zshrc" - "zinputrc" - "zprofile" - # Users, Groups, NSS - "passwd" - "group" - "shadow" - "hosts" - "resolv.conf" - "nsswitch.conf" - # User profiles - "profiles" - # Sudo & Su - "login.defs" - "sudoers" - "sudoers.d" - # Time - "localtime" - "zoneinfo" - # Other Core Stuff - "machine-id" - "os-release" - # PAM - "pam.d" - # Fonts - "fonts" - # ALSA - "alsa" - "asound.conf" - # SSL - "ssl/certs" - "ca-certificates" - "pki" - ]; - in map (path: "/etc/${path}") files; + etcBindEntries = + let + files = [ + # NixOS Compatibility + "static" + "nix" # mainly for nixUnstable users, but also for access to nix/netrc + # Shells + "shells" + "bashrc" + "zshenv" + "zshrc" + "zinputrc" + "zprofile" + # Users, Groups, NSS + "passwd" + "group" + "shadow" + "hosts" + "resolv.conf" + "nsswitch.conf" + # User profiles + "profiles" + # Sudo & Su + "login.defs" + "sudoers" + "sudoers.d" + # Time + "localtime" + "zoneinfo" + # Other Core Stuff + "machine-id" + "os-release" + # PAM + "pam.d" + # Fonts + "fonts" + # ALSA + "alsa" + "asound.conf" + # SSL + "ssl/certs" + "ca-certificates" + "pki" + ]; + in + map (path: "/etc/${path}") files; # Here's the problem case: # - we need to run bash to run the init script @@ -119,182 +144,208 @@ let # # Also, the real init is placed strategically at /init, so we don't # have to recompile this every time. - containerInit = runCommandCC "container-init" { - buildInputs = [ stdenv.cc.libc.static or null ]; - } '' - $CXX -static -s -o $out ${./container-init.cc} - ''; + containerInit = + runCommandCC "container-init" + { + buildInputs = [ stdenv.cc.libc.static or null ]; + } + '' + $CXX -static -s -o $out ${./container-init.cc} + ''; - realInit = run: writeShellScript "${name}-init" '' - source /etc/profile - exec ${run} "$@" - ''; + realInit = + run: + writeShellScript "${name}-init" '' + source /etc/profile + exec ${run} "$@" + ''; indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str))); - bwrapCmd = { initArgs ? "" }: '' - ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) - ro_mounts=() - symlinks=() - etc_ignored=() + bwrapCmd = + { + initArgs ? "", + }: + '' + ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) + ro_mounts=() + symlinks=() + etc_ignored=() - ${extraPreBwrapCmds} + ${extraPreBwrapCmds} - # loop through all entries of root in the fhs environment, except its /etc. - for i in ${fhsenv}/*; do - path="/''${i##*/}" - if [[ $path == '/etc' ]]; then - : - elif [[ -L $i ]]; then - symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path") - ignored+=("$path") - else - ro_mounts+=(--ro-bind "$i" "$path") - ignored+=("$path") - fi - done - - # loop through the entries of /etc in the fhs environment. - if [[ -d ${fhsenv}/etc ]]; then - for i in ${fhsenv}/etc/*; do + # loop through all entries of root in the fhs environment, except its /etc. + for i in ${fhsenv}/*; do path="/''${i##*/}" - # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we - # don't want to override it with a path from the FHS environment. - if [[ $path == '/fonts' || $path == '/ssl' ]]; then + if [[ $path == '/etc' ]]; then + : + elif [[ -L $i ]]; then + symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path") + ignored+=("$path") + else + ro_mounts+=(--ro-bind "$i" "$path") + ignored+=("$path") + fi + done + + # loop through the entries of /etc in the fhs environment. + if [[ -d ${fhsenv}/etc ]]; then + for i in ${fhsenv}/etc/*; do + path="/''${i##*/}" + # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we + # don't want to override it with a path from the FHS environment. + if [[ $path == '/fonts' || $path == '/ssl' ]]; then + continue + fi + if [[ -L $i ]]; then + symlinks+=(--symlink "$i" "/etc$path") + else + ro_mounts+=(--ro-bind "$i" "/etc$path") + fi + etc_ignored+=("/etc$path") + done + fi + + # propagate /etc from the actual host if nested + if [[ -e /.host-etc ]]; then + ro_mounts+=(--ro-bind /.host-etc /.host-etc) + else + ro_mounts+=(--ro-bind /etc /.host-etc) + fi + + # link selected etc entries from the actual root + for i in ${escapeShellArgs etcBindEntries}; do + if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then continue fi - if [[ -L $i ]]; then - symlinks+=(--symlink "$i" "/etc$path") - else - ro_mounts+=(--ro-bind "$i" "/etc$path") + if [[ -e $i ]]; then + symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i") fi - etc_ignored+=("/etc$path") done - fi - # propagate /etc from the actual host if nested - if [[ -e /.host-etc ]]; then - ro_mounts+=(--ro-bind /.host-etc /.host-etc) - else - ro_mounts+=(--ro-bind /etc /.host-etc) - fi - - # link selected etc entries from the actual root - for i in ${escapeShellArgs etcBindEntries}; do - if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then - continue - fi - if [[ -e $i ]]; then - symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i") - fi - done - - declare -a auto_mounts - # loop through all directories in the root - for dir in /*; do - # if it is a directory and it is not ignored - if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then - # add it to the mount list - auto_mounts+=(--bind "$dir" "$dir") - fi - done - - declare -a x11_args - # Always mount a tmpfs on /tmp/.X11-unix - # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 - x11_args+=(--tmpfs /tmp/.X11-unix) - - # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. - if [[ "$DISPLAY" == *:* ]]; then - # recover display number from $DISPLAY formatted [host]:num[.screen] - display_nr=''${DISPLAY/#*:} # strip host - display_nr=''${display_nr/%.*} # strip screen - local_socket=/tmp/.X11-unix/X$display_nr - x11_args+=(--ro-bind-try "$local_socket" "$local_socket") - fi - - ${optionalString privateTmp '' - # sddm places XAUTHORITY in /tmp - if [[ "$XAUTHORITY" == /tmp/* ]]; then - x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") - fi - - # dbus-run-session puts the socket in /tmp - IFS=";" read -ra addrs <<<"$DBUS_SESSION_BUS_ADDRESS" - for addr in "''${addrs[@]}"; do - [[ "$addr" == unix:* ]] || continue - IFS="," read -ra parts <<<"''${addr#unix:}" - for part in "''${parts[@]}"; do - printf -v part '%s' "''${part//\\/\\\\}" - printf -v part '%b' "''${part//%/\\x}" - [[ "$part" == path=/tmp/* ]] || continue - x11_args+=(--ro-bind-try "''${part#path=}" "''${part#path=}") + declare -a auto_mounts + # loop through all directories in the root + for dir in /*; do + # if it is a directory and it is not ignored + if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then + # add it to the mount list + auto_mounts+=(--bind "$dir" "$dir") + fi done - done - ''} - cmd=( - ${bubblewrap}/bin/bwrap - --dev-bind /dev /dev - --proc /proc - --chdir "$(pwd)" - ${optionalString unshareUser "--unshare-user"} - ${optionalString unshareIpc "--unshare-ipc"} - ${optionalString unsharePid "--unshare-pid"} - ${optionalString unshareNet "--unshare-net"} - ${optionalString unshareUts "--unshare-uts"} - ${optionalString unshareCgroup "--unshare-cgroup"} - ${optionalString dieWithParent "--die-with-parent"} - --ro-bind /nix /nix - ${optionalString privateTmp "--tmpfs /tmp"} - # Our glibc will look for the cache in its own path in `/nix/store`. - # As such, we need a cache to exist there, because pressure-vessel - # depends on the existence of an ld cache. However, adding one - # globally proved to be a bad idea (see #100655), the solution we - # settled on being mounting one via bwrap. - # Also, the cache needs to go to both 32 and 64 bit glibcs, for games - # of both architectures to work. - --tmpfs ${glibc}/etc \ - --tmpfs /etc \ - --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ - --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ - --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ - --remount-ro ${glibc}/etc \ - --symlink ${realInit runScript} /init \ - '' + optionalString fhsenv.isMultiBuild (indentLines '' + declare -a x11_args + # Always mount a tmpfs on /tmp/.X11-unix + # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 + x11_args+=(--tmpfs /tmp/.X11-unix) + + # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. + if [[ "$DISPLAY" == *:* ]]; then + # recover display number from $DISPLAY formatted [host]:num[.screen] + display_nr=''${DISPLAY/#*:} # strip host + display_nr=''${display_nr/%.*} # strip screen + local_socket=/tmp/.X11-unix/X$display_nr + x11_args+=(--ro-bind-try "$local_socket" "$local_socket") + fi + + ${optionalString privateTmp '' + # sddm places XAUTHORITY in /tmp + if [[ "$XAUTHORITY" == /tmp/* ]]; then + x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") + fi + + # dbus-run-session puts the socket in /tmp + IFS=";" read -ra addrs <<<"$DBUS_SESSION_BUS_ADDRESS" + for addr in "''${addrs[@]}"; do + [[ "$addr" == unix:* ]] || continue + IFS="," read -ra parts <<<"''${addr#unix:}" + for part in "''${parts[@]}"; do + printf -v part '%s' "''${part//\\/\\\\}" + printf -v part '%b' "''${part//%/\\x}" + [[ "$part" == path=/tmp/* ]] || continue + x11_args+=(--ro-bind-try "''${part#path=}" "''${part#path=}") + done + done + ''} + + cmd=( + ${bubblewrap}/bin/bwrap + --dev-bind /dev /dev + --proc /proc + --chdir "$(pwd)" + ${optionalString unshareUser "--unshare-user"} + ${optionalString unshareIpc "--unshare-ipc"} + ${optionalString unsharePid "--unshare-pid"} + ${optionalString unshareNet "--unshare-net"} + ${optionalString unshareUts "--unshare-uts"} + ${optionalString unshareCgroup "--unshare-cgroup"} + ${optionalString dieWithParent "--die-with-parent"} + --ro-bind /nix /nix + ${optionalString privateTmp "--tmpfs /tmp"} + # Our glibc will look for the cache in its own path in `/nix/store`. + # As such, we need a cache to exist there, because pressure-vessel + # depends on the existence of an ld cache. However, adding one + # globally proved to be a bad idea (see #100655), the solution we + # settled on being mounting one via bwrap. + # Also, the cache needs to go to both 32 and 64 bit glibcs, for games + # of both architectures to work. + --tmpfs ${glibc}/etc \ + --tmpfs /etc \ + --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ + --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ + --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ + --remount-ro ${glibc}/etc \ + --symlink ${realInit runScript} /init \ + '' + + optionalString fhsenv.isMultiBuild (indentLines '' --tmpfs ${pkgsi686Linux.glibc}/etc \ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \ --remount-ro ${pkgsi686Linux.glibc}/etc \ - '') + '' - "''${ro_mounts[@]}" - "''${symlinks[@]}" - "''${auto_mounts[@]}" - "''${x11_args[@]}" - ${concatStringsSep "\n " extraBwrapArgs} - ${containerInit} ${initArgs} - ) - exec "''${cmd[@]}" - ''; - - bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name (nameAttrs // { - inherit nativeBuildInputs meta; - - passthru = passthru // { - env = runCommandLocal "${name}-shell-env" { - shellHook = bwrapCmd {}; - } '' - echo >&2 "" - echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 + '') + + '' + "''${ro_mounts[@]}" + "''${symlinks[@]}" + "''${auto_mounts[@]}" + "''${x11_args[@]}" + ${concatStringsSep "\n " extraBwrapArgs} + ${containerInit} ${initArgs} + ) + exec "''${cmd[@]}" ''; - inherit args fhsenv; - }; -}) '' - mkdir -p $out/bin - ln -s ${bin} $out/bin/${executableName} - ${extraInstallCommands} -'' + bin = writeShellScript "${name}-bwrap" (bwrapCmd { + initArgs = ''"$@"''; + }); +in +runCommandLocal name + ( + nameAttrs + // { + inherit nativeBuildInputs; + + passthru = passthru // { + env = + runCommandLocal "${name}-shell-env" + { + shellHook = bwrapCmd { }; + } + '' + echo >&2 "" + echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + inherit args fhsenv; + }; + + meta = { + mainProgram = executableName; + } // meta; + } + ) + '' + mkdir -p $out/bin + ln -s ${bin} $out/bin/${executableName} + + ${extraInstallCommands} + '' diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index e589804fbe32..1110e01f7dd9 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -52,8 +52,7 @@ { name = "dotnet-fixup-hook"; substitutions = { - # this is used for DOTNET_ROOT, so we need unwrapped - dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime.unwrapped else null; + dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; wrapperPath = lib.makeBinPath [ which coreutils ]; }; } diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 5ee24ad3af0b..c1cf87173637 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcmidi"; - version = "2024.10.10"; + version = "2024.12.06"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-dAxr1RJrYppt/Gw6ZF3fL0lDhwJNG5v75M6VA1okrtw="; + hash = "sha256-uSmkRoAy2tCvSy/jE0wxg2nhiQRF62zCwnr41YpRkXE="; }; meta = { diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index b1aaf615c6e5..738b17374dfa 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-/TIG1UUfLct9MxCmahWk7F6KlypNan+zk/02zVpPV+w="; + hash = "sha256-Uzt7tKRj+iq4UR0gUpfhiTzMjecVBcp7jsXC7lSADeg="; }; # All requirements are pinned diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index f61070487d0d..4c8351d0a650 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -8,7 +8,7 @@ glib-networking, google-fonts, lib, - libsoup, + libsoup_2_4, nodejs, npmHooks, openssl, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking - libsoup + libsoup_2_4 webkitgtk_4_0 ] ++ dotnetSdk.packages diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index f0d60c42a33a..f002e8450277 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -23,19 +23,17 @@ let suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; - # Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master - glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; }); in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2024.Q3.3"; + version = "2024.Q4.2"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0="; + hash = "sha256-16eHtdxoSCVEPQNvi7Kuo7CP4yddMsZqpuRsWobEOnw="; }; buildInputs = @@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { [ cmake directx-shader-compiler - glslang_fixed + glslang ninja patchelf perl diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index c3573c4d30fb..02b23a2fba57 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-10-25"; + version = "0-unstable-2024-11-22"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "707b16506be2c54028546181461ebf47cfe72d83"; - hash = "sha256-189eHlSLGgSgT2KIkj+c5pKpPZ34vacZzlYOFGfwEFM="; + rev = "7b660e4c0e3dccec7ddc4c4dafc1717cb06b7e1e"; + hash = "sha256-7MwAveke3GL8tmOCxCgKRbllChST22FKWdbGsewCJdM="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index d2977d638a51..25b3c3c34046 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.12.24"; + version = "3.12.26"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20241202103051/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-jI/qcIIrNU9ViaZ/LKMkUETXZpintDsofSgiRfe4GOU="; + url = "https://web.archive.org/web/20241206172526/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-K/qe/qxMfcGWU5gyEfPdl0ptjTCWaqIXMCy4O8WEKCQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 67ee8d878706..f8a33a0c4041 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -44,7 +44,7 @@ , isocodes , libpsl , libepoxy -, libsoup +, libsoup_2_4 , exiv2 , libXtst , libthai @@ -138,7 +138,7 @@ stdenv.mkDerivation { libsecret libselinux libsepol - libsoup + libsoup_2_4 libsysprof-capture libthai libwebp diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix new file mode 100644 index 000000000000..20c446c38ba4 --- /dev/null +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -0,0 +1,79 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, + pnpm, + nodejs, + fetchpatch, + stdenv, +}: + +buildGoModule rec { + pname = "apache-answer"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "incubator-answer"; + rev = "refs/tags/v${version}"; + hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI="; + }; + + webui = stdenv.mkDerivation { + pname = pname + "-webui"; + inherit version src; + + sourceRoot = "${src.name}/ui"; + + pnpmDeps = pnpm.fetchDeps { + inherit src version pname; + sourceRoot = "${src.name}/ui"; + hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA="; + }; + + nativeBuildInputs = [ + pnpm.configHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r build/* $out + + runHook postInstall + ''; + }; + + vendorHash = "sha256-nvXr1YAqVCyhCgPtABTOtzDH+FCQhN9kSEhxKw7ipsE="; + + preBuild = '' + cp -r ${webui}/* ui/build/ + ''; + + patches = [ + (fetchpatch { + url = "https://github.com/apache/incubator-answer/commit/57b0d0e84dd0e0bf3c8a05a38a7f55eddc5f0dda.patch"; + hash = "sha256-TfF+PtrcMYYgNjgU4lGpnshdII8xECTT2L7M26uebn0="; + }) + ]; + + meta = { + homepage = "https://answer.apache.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "answer"; + changelog = "https://github.com/apache/incubator-answer/releases/tag/v${version}"; + description = "Q&A platform software for teams at any scales"; + }; +} diff --git a/pkgs/by-name/ar/ario/package.nix b/pkgs/by-name/ar/ario/package.nix index 2231031d0481..cf4065a8e9d1 100644 --- a/pkgs/by-name/ar/ario/package.nix +++ b/pkgs/by-name/ar/ario/package.nix @@ -10,7 +10,7 @@ , gettext , gtk3 , libmpdclient -, libsoup +, libsoup_2_4 , libxml2 , taglib , wrapGAppsHook3 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dbus-glib gtk3 libmpdclient - libsoup + libsoup_2_4 libxml2 taglib ]; diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index 43bf239930e7..fd29ba87d9b1 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-HpS2T08GRh+QOdCUrv6dSyjGbTSRayekVgVefWLXNwI="; + hash = "sha256-8jHNZBBHrbbAGtslEVczJqi7eik9F7VMdwVQmT3q3os="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index c621d042bb24..e68e9da7e3d1 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.28.5"; + version = "0.30.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-oyECtP/YeEhvsltWZq52YNq+Gbbpko9bbbUTh5NA/9c="; + hash = "sha256-hM4IycRE3/jiwFLqkU/jz9sPP9KTfeu8ouIJlqgPxmk="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-oiRpmGfuc37s3ZD8R7L9EFieqJP7mYvDsiJBzruCSkA="; + vendorHash = "sha256-uH+Q5NXBL1+LFa6tw3x2CE1B5QElqK9KuFeYQpCFAW0="; subPackages = [ "." ]; diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index b5b441db8990..56af6e274452 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "f850db23fe37dfe5044c2f5f641931528b291bf2", - "hash": "sha256-iboQnPmWIk/bYjEF+opjKU+XJVSD5DGCfqp6BJQRW3w=", - "version": "2.17.2", - "depsHash": "sha256-W56EG5SCiAcjHhR5WR1UBY9Xt0D0p8duEiUzx+luLfc=", - "clientDepsHash": "sha256-gEgd2PCFWqNuRXhnFZylGS0GTMJUD0KeHbRgYxMUMPM=" + "rev": "890b0b949ee758102fd05ba26c5ed5c3ebbd747f", + "hash": "sha256-sMtUO2ltlxipjNXqcHLVXlZZ8QOAGND77hItwcxx27Q=", + "version": "2.17.4", + "depsHash": "sha256-b2mcJ+Qh+VEYaZcy4LGCFPK9dFYsy48wUaEAJGYtBwc=", + "clientDepsHash": "sha256-CfRG7GqvtLL675Bkzi/WOERwp0EKzmC3u0ozxHoj9rI=" } diff --git a/pkgs/by-name/aw/aws-shell/package.nix b/pkgs/by-name/aw/aws-shell/package.nix new file mode 100644 index 000000000000..5b1222f5ef84 --- /dev/null +++ b/pkgs/by-name/aw/aws-shell/package.nix @@ -0,0 +1,55 @@ +{ + python3Packages, + lib, + fetchFromGitHub, + awscli, +}: + +python3Packages.buildPythonApplication rec { + pname = "aws-shell"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-shell"; + rev = "refs/tags/${version}"; + hash = "sha256-m96XaaFDFQaD2YPjw8D1sGJ5lex4Is4LQ5RhGzVPvH4="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + botocore + pygments + mock + configobj + awscli + (prompt-toolkit.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "prompt-toolkit"; + repo = "python-prompt-toolkit"; + rev = "refs/tags/1.0.18"; # Need >=1.0.0,<1.1.0 + hash = "sha256-mt/fIubkpeVc7vhAaTk0pXZXI8JzB7n2MzXqgqK0wE4="; + }; + })) + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = { + homepage = "https://github.com/awslabs/aws-shell"; + description = "Integrated shell for working with the AWS CLI"; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "aws-shell"; + }; +} diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index 9598f6118cb1..5dad38307896 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -14,7 +14,7 @@ , webkitgtk_4_0 , librsvg , gdk-pixbuf -, libsoup +, libsoup_2_4 , glib-networking , graphicsmagick_q16 , libva @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk_4_0 librsvg gdk-pixbuf - libsoup + libsoup_2_4 glib-networking graphicsmagick_q16 hiredis diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 21a20ad7dd16..c03f97d07d00 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -2,34 +2,31 @@ lib, python3, fetchFromGitHub, + fetchPypi, git, }: let - changeVersion = - overrideFunc: version: hash: - overrideFunc (oldAttrs: rec { - inherit version; - src = oldAttrs.src.override { - inherit version hash; - }; - }); - - localPython = python3.override { - self = localPython; + python = python3.override { packageOverrides = self: super: { - cement = - changeVersion super.cement.overridePythonAttrs "2.10.14" - "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + cement = super.cement.overridePythonAttrs (old: rec { + pname = "cement"; + version = "2.10.14"; + src = fetchPypi { + inherit pname version; + hash = "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + }; + build-system = old.build-system or [ ] ++ (with python.pkgs; [ setuptools ]); + doCheck = false; + }); }; }; - in -localPython.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "awsebcli"; version = "3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "aws"; @@ -38,12 +35,23 @@ localPython.pkgs.buildPythonApplication rec { hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; }; + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + "urllib3" + ]; + postPatch = '' # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," "" + substituteInPlace setup.py \ + --replace-fail "scripts=['bin/eb']," "" ''; - propagatedBuildInputs = with localPython.pkgs; [ + dependencies = with python.pkgs; [ blessed botocore cement @@ -59,20 +67,11 @@ localPython.pkgs.buildPythonApplication rec { websocket-client ]; - pythonRelaxDeps = [ - "botocore" - "colorama" - "pathspec" - "PyYAML" - "six" - "termcolor" - ]; - - nativeCheckInputs = with localPython.pkgs; [ - pytestCheckHook - pytest-socket - mock + nativeCheckInputs = with python.pkgs; [ git + mock + pytest-socket + pytestCheckHook ]; pytestFlagsArray = [ @@ -92,11 +91,11 @@ localPython.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "Command line interface for Elastic Beanstalk"; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; - maintainers = with maintainers; [ kirillrdy ]; license = licenses.asl20; + maintainers = with maintainers; [ kirillrdy ]; mainProgram = "eb"; }; } diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index ee9eb2e640ae..c0363376e235 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "balena-cli"; - version = "19.0.13"; + version = "20.0.9"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU="; + hash = "sha256-UmtTFSUCxz9oAep9+k0GBCxfFkHNDwoKvThIkFq93PQ="; }; - npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc="; + npmDepsHash = "sha256-hie3ZWbqBKB4CRZG46oXyiYC8A/JLjdHkTh6VdZe1Qo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 173acc6d3b46..bce13edccf9b 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.4"; + version = "1.6.1"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-gu3XPl4gKL+k9hX9OVJYGvG3R81c5lZauRJdUFrqtqk="; + hash = "sha256-Qf9FqHgTSCD2rYp8PC/gYHyiYcfFTJJmG4oRK/bch8Y="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index 487e71225679..2a733e9fed9e 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-Y+k8ObfMwN6fLR2+Lwn64xHljDf3kxw2xp0YpJKbrDM="; + hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk="; }; vendorHash = null; diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index 14b3e0348370..fb6a23d4dbc1 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -2,21 +2,21 @@ lib, stdenv, fetchurl, - electron_30, + electron, dpkg, makeWrapper, commandLineArgs ? "", }: let - version = "1.14.0-2"; + version = "1.15.2-2"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds="; + hash = "sha256-juAhvdeLzjHDs59eS+wwUn3OmnDecC17Vclp0Q0LtJw="; }; aarch64-linux = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb"; - hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0="; + hash = "sha256-8o0MX0Ih07KQ9wE+nonSZaupSOuUVyuoIbdHYmR29mc="; }; }; src = @@ -25,11 +25,6 @@ in stdenv.mkDerivation { pname = "bilibili"; inherit src version; - unpackPhase = '' - runHook preUnpack - dpkg -x $src ./ - runHook postUnpack - ''; nativeBuildInputs = [ makeWrapper @@ -43,7 +38,7 @@ stdenv.mkDerivation { cp -r usr/share $out/share sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt - makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \ + makeWrapper ${lib.getExe electron} $out/bin/bilibili \ --argv0 "bilibili" \ --add-flags "$out/opt/app.asar" \ --add-flags ${lib.escapeShellArg commandLineArgs} @@ -67,7 +62,7 @@ stdenv.mkDerivation { "x86_64-linux" "aarch64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "bilibili"; }; } diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index c1af929bdc67..3e3cfaa3e541 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.5"; + version = "3.4.2"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE="; + hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/by-name/br/broot/package.nix similarity index 91% rename from pkgs/tools/misc/broot/default.nix rename to pkgs/by-name/br/broot/package.nix index 38fc65a74d6c..c1c705a7d40b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -7,13 +7,9 @@ , pkg-config , libgit2 , oniguruma -, libiconv -, Foundation -, Security -, xorg , zlib , buildPackages -, withClipboard ? !stdenv.hostPlatform.isDarwin +, withClipboard ? true , withTrash ? !stdenv.hostPlatform.isDarwin }: @@ -36,10 +32,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - libiconv - Security + # TODO: once https://github.com/Canop/broot/issues/956 is released, oniguruma can be removed. + buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix new file mode 100644 index 000000000000..8dcef1f1f0f4 --- /dev/null +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitLab, + inih, + lib, + libdrm, + libinput, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + stdenv, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "buffybox"; + version = "3.2.0-unstable-2024-11-10"; + + src = fetchFromGitLab { + domain = "gitlab.postmarketos.org"; + owner = "postmarketOS"; + repo = "buffybox"; + fetchSubmodules = true; # to use its vendored lvgl + rev = "07e324c17564cb9aab573259a8e0824a6806a751"; + hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + inih + libdrm + libinput + libxkbcommon + ]; + + env.PKG_CONFIG_SYSTEMD_SYSTEMD_SYSTEM_UNIT_DIR = "${placeholder "out"}/lib/systemd/system"; + + strictDeps = true; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A suite of graphical applications for the terminal"; + homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox"; + license = licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix similarity index 89% rename from pkgs/development/tools/rust/cargo-deadlinks/default.nix rename to pkgs/by-name/ca/cargo-deadlinks/package.nix index b5e73fd9e0df..13cfbcced456 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, apple-sdk_11 }: rustPlatform.buildRustPackage rec { pname = "cargo-deadlinks"; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index 923867851b5d..5308cfca1158 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.32"; + version = "0.6.33"; src = fetchCrate { inherit pname version; - hash = "sha256-XjubvjK+FySm0nqlzFsRhDQOI9M0enonwwPhZ/KFFlk="; + hash = "sha256-/O05q4osyQ30rHKe84oBQJTFuVmPGB5KKy6UM/TzY5Q="; }; - cargoHash = "sha256-sWXeGohH9iLMkmBgNjSfg25eDzZHSzWrOGgccuWPBLM="; + cargoHash = "sha256-vkvna8+1+qQh+ZXtQ/HJa8UnstuH1sKlFc4CEUZYc5E="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 049ef9faf03a..e769be4b2002 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.41"; + version = "0.2.42"; src = fetchCrate { inherit pname version; - hash = "sha256-U9i/xp9WxMYf4GMsZB7qYOpuuuEw4mWZp+ZEyguGtQQ="; + hash = "sha256-3KdHEmoGdtfc5b5H7EQ1q5vqra0hRrROJYCIpiqxshk="; }; - cargoHash = "sha256-eUaEpex9x9bdqPJ4p5QvkWKaxs3ih4Gb9+4deGBZgXU="; + cargoHash = "sha256-GwzGdy6aWnKyaQbtgRB6t0cnWWiirN9j/GqhdBc5fHU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 7ee93d6642cc..3ec0a69ddcbd 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -6,7 +6,7 @@ cargo-tauri, cargo-tauri_1, gtk3, - libsoup, + libsoup_2_4, openssl, webkitgtk_4_0, }: @@ -40,7 +40,7 @@ cargo-tauri.overrideAttrs ( [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 101ba9bb74ce..7c3c44b13791 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -8,7 +8,7 @@ cairo, stdenv, librsvg, - libsoup, + libsoup_2_4, fetchzip, openssl_3, webkitgtk_4_0, @@ -43,7 +43,7 @@ stdenv.mkDerivation { gtk3 cairo gdk-pixbuf - libsoup + libsoup_2_4 glib dbus openssl_3 diff --git a/pkgs/by-name/ch/chocolate-doom/package.nix b/pkgs/by-name/ch/chocolate-doom/package.nix index 7eb282402042..677fed32aea1 100644 --- a/pkgs/by-name/ch/chocolate-doom/package.nix +++ b/pkgs/by-name/ch/chocolate-doom/package.nix @@ -1,31 +1,29 @@ -{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net -, fetchFromGitHub, fetchpatch, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libpng, + libsamplerate, + pkg-config, + python3, + SDL2, + SDL2_mixer, + SDL2_net, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chocolate-doom"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "chocolate-doom"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp"; + repo = "chocolate-doom"; + rev = "refs/tags/chocolate-doom-${finalAttrs.version}"; + hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU="; }; - patches = [ - # Pull upstream patch to fix builx against gcc-10: - # https://github.com/chocolate-doom/chocolate-doom/pull/1257 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch"; - sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj"; - }) - ]; - - outputs = [ "out" "man" ]; - postPatch = '' - sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am patchShebangs --build man/{simplecpp,docgen} ''; @@ -35,15 +33,31 @@ stdenv.mkDerivation rec { # for documentation python3 ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; + + buildInputs = [ + libpng + libsamplerate + SDL2 + SDL2_mixer + SDL2_net + ]; + + outputs = [ + "out" + "man" + ]; + enableParallelBuilding = true; + strictDeps = true; + meta = { - homepage = "http://chocolate-doom.org/"; + homepage = "https://www.chocolate-doom.org"; + changelog = "https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-${finalAttrs.version}"; description = "Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; + mainProgram = "chocolate-doom"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - hydraPlatforms = lib.platforms.linux; # darwin times out - maintainers = [ ]; + maintainers = with lib.maintainers; [ Gliczy ]; }; -} +}) diff --git a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch new file mode 100644 index 000000000000..470deb32e9c9 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 99065da..2415738 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,6 @@ endif + ifeq ($(CC), clang) + CFLAGS += $(CLANG_FLAGS) + endif +-ifeq ($(shell uname), Linux) +- CFLAGS += -static +-endif + + Target = chsrc + diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix new file mode 100644 index 000000000000..d59c2823ee20 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + stdenv, + texinfo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chsrc"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "RubyMetric"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; + }; + + nativeBuildInputs = [ texinfo ]; + + patches = [ + ./disable-static-compiling.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm755 chsrc $out/bin/chsrc + install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ + makeinfo doc/chsrc.texi --output=chsrc.info + install -Dm 644 chsrc.info -t $out/share/info/ + runHook postInstall + ''; + + meta = { + description = "Change Source everywhere for every software"; + homepage = "https://chsrc.run/"; + changelog = "https://github.com/RubyMetric/chsrc/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + gpl3Plus + mit + ]; + maintainers = with lib.maintainers; [ cryo ]; + platforms = lib.platforms.all; + mainProgram = "chsrc"; + }; +}) diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index b68af648c6ee..a42d9906a4d2 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-5vyWMoDASzRa9m2UueoyMbmK8JPUpplqk0/uv8fHPAU="; - aarch64-linux = "sha256-zfar/dZkSVSrnrRpfF4RnwvkPVzmdLJa4W9Ds8NNNaI="; - x86_64-darwin = "sha256-3jab0NxGH+cac2Ughq/l2ZAQLISD7z+WBtFFyiFc+5A="; - aarch64-darwin = "sha256-SO5L9aBMN5pYloBeVH1uQO0QeiHzDK+6kHVEg8uYnTo="; + x86_64-linux = "sha256-6zdP0d5XyBYG7+SGqb2DSaD6rJrBn8OjGr9BXfP1Ctc="; + aarch64-linux = "sha256-7u/AKZGL/AkUsakZexC/oxgjoayaxH7OiRE+xnH+Gus="; + x86_64-darwin = "sha256-/uDxZVlULl3PnuAaF7kWAyukaQoF7DV8m5gowTFdMEQ="; + aarch64-darwin = "sha256-xZ60pi2JYSLDLaR0Qe/fyEhzyu17U2fbDp1lo2qViIs="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index b89bea347254..273189376cf4 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -1,6 +1,8 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -16,17 +18,25 @@ buildGoModule rec { vendorHash = "sha256-6J9AWONLP/FvR0dXt5Zx4n+kTpmnxF79HcWVFp9OZ0g="; + subPackages = [ "cmd/cloudlist/" ]; + ldflags = [ "-w" "-s" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { description = "Tool for listing assets from multiple cloud providers"; - mainProgram = "cloudlist"; homepage = "https://github.com/projectdiscovery/cloudlist"; changelog = "https://github.com/projectdiscovery/cloudlist/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "cloudlist"; }; } diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 2ff381e098a0..ff8543b7fd60 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.43.0"; + version = "0.43.6"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.0-build-24112423a8e6ct7-x86_64.AppImage"; - hash = "sha256-IcAUXGSMHxGd5Ak4cYA9/2YYg8UA+cRBGgnOupDuRXs="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.6-build-241206z7j6me2e2-x86_64.AppImage"; + hash = "sha256-adEyDExGvxwpvAT0qYiCfvkpINP9BJ6a+LSwQHQ/H/U="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index ccf0d49d0cff..d3f6955c2cd2 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.3"; + version = "0.4.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-95vjfjXKLXyg0d8FNAszBKwNVm9g8wRKzzHzxhTS8Bs="; + hash = "sha256-BkWI4FbacgFrbSLNSqe7vdzdLvrrgX1528qFaKCd5tY="; }; - cargoHash = "sha256-IQTT7YylByGJhFV6sLSDmVhFahkByY2S4+IE7cNxLjg="; + cargoHash = "sha256-eFS16QzPMLhoVb+hqt/p3ka58rwP5WTgHas2PZT5c/U="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index ab1980449c29..7a631ff16160 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA="; + hash = "sha256-+Xq4/cRtTYqbexajHtILAZvy0NWLn9UMxR1ksg0/JuY="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y="; + vendorHash = "sha256-YX2JDDZ1jx32zfFj/2fY61zqxPIzmwntN+7kiGDxxV4="; ldflags = [ "-s" diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 1d838b0ba2a2..fc4cea2f40f4 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.26.1"; + version = "5.27.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ft8gusZ6We3nEAOwccGrUidxpO5tdWR5VNDQ/r5l2P8="; + sha256 = "sha256-pjEWTNcZwcrKUsXXHia8aLSCw7R8aEr6GBvD7yiYFXo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index 8c3af939719b..78c36c3b6cec 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.1.20"; + version = "0.1.22"; in rustPlatform.buildRustPackage { pname = "crates-tui"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "ratatui"; repo = "crates-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-K3ttXoSS4GZyHnqS95op8kmbAi4/KjKa0P6Nzqqpjyw="; + hash = "sha256-+fyCNkSTmWrztEEsQkRoMXikOn1Q+suP2IZuSXb3ELQ="; }; - cargoHash = "sha256-ztLBM6CR2WMKR9cfBY95BvSaD05C+AEa6C/nOdDxqf0="; + cargoHash = "sha256-RnrPh0DBtX4BKSE8qC8MuyL6VXlH05wXYW/iOAs4SD8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix index 0dca4f13889c..cfb5acb30107 100644 --- a/pkgs/by-name/cr/crd2pulumi/package.nix +++ b/pkgs/by-name/cr/crd2pulumi/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-sXZ5iImN+AwAEV6Xur4EbDZhzQEYJFf9AgaBf1wQAIA="; + sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s="; }; vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk="; diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix new file mode 100644 index 000000000000..66564ac60053 --- /dev/null +++ b/pkgs/by-name/cu/cups-browsed/package.nix @@ -0,0 +1,47 @@ +{ + autoreconfHook, + avahi, + cups, + fetchFromGitHub, + glib, + lib, + libcupsfilters, + libppd, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "cups-browsed"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-browsed"; + rev = version; + hash = "sha256-UkPJqVWG6obIW0jGXsnnYB2lmIm/uiMuPYSGY3+M4Gw="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + + buildInputs = [ + avahi + libcupsfilters + libppd + glib + ]; + + configureFlags = [ + "--with-rcdir=no" + ]; + + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 2e3b0c1e911e..6119aaf63741 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -42,7 +42,7 @@ buildDotnetModule rec { ''; dotnet-sdk = dotnetCorePackages.sdk_6_0; - buildInputs = [ jdk11 ]; + nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; # Build just these projects. Building Source/Dafny.sln includes a bunch of diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index e3a32dba4658..ee1a83dd1da9 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, libsoup +, libsoup_2_4 , graphicsmagick , json-glib , wrapGAppsHook3 @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { openexr_3 sqlite libxslt - libsoup + libsoup_2_4 graphicsmagick json-glib openjpeg diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index c9cc55579986..854f9688a796 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.2.3"; + version = "24.3.0"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8="; - aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM="; - x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs="; - aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg="; + x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw="; + aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow="; + x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20="; + aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo="; }; in fetchurl { diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index ce832d4d10d9..c45c48185103 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - # so the cargo fetcher won't try to run the `./configure` script - dontConfigure = true; hash = "sha256-bD8MYufI87j//7dIAnCzmp4yoOaT81Zv1i7rjWpjPlc="; }; diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 0eb643a44b04..98136e89ea97 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , pkg-config , gtk3 -, libsoup +, libsoup_2_4 , webkitgtk_4_0 }: @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 68722d2c6142..81a3b2fa09df 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -40,7 +40,7 @@ buildDotnetModule rec { license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = with maintainers; [ ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; mainProgram = "discordchatexporter-cli"; }; } diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix index 61574df27c19..cefe7e90fd0f 100644 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ b/pkgs/by-name/dl/dleyna-renderer/package.nix @@ -11,7 +11,7 @@ , gupnp , gupnp-av , gupnp-dlna -, libsoup +, libsoup_2_4 , makeWrapper , docbook-xsl-nons , libxslt @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gupnp gupnp-av gupnp-dlna - libsoup + libsoup_2_4 ]; preFixup = '' diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix index cec03d84c649..ff24f5bf7c56 100644 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ b/pkgs/by-name/dl/dleyna-server/package.nix @@ -12,7 +12,7 @@ , gupnp , gupnp-av , gupnp-dlna -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gupnp gupnp-av gupnp-dlna - libsoup + libsoup_2_4 ]; preFixup = '' diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix index 1b3a3d1add58..0f2da4e6811b 100644 --- a/pkgs/by-name/do/docker-init/package.nix +++ b/pkgs/by-name/do/docker-init/package.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "docker-init"; - version = "v1.3.0"; - tag = "157355"; + version = "v1.4.0"; + tag = "175267"; src = fetchurl { url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst"; @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "docker-init"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - badPlatforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ BastianAsmussen ]; }; diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 573c75351266..a27cf61e41ad 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.43.1"; + version = "1.43.15"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-i+WW8udVjLQGMg0eu03hInfXaLZzVJ4liKE4eQ/KDww="; + sha256 = "sha256-dmRi+VZWmHPbTgkShS/zQ7/JaNJ2GSw0l1gGEC/zmkA="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-0SvM6I+zGelSUMlbeeqljfzITw0Cnl2BZHJ78n+m5ds="; + vendorHash = "sha256-FXVLvPoKzMuGpaXa3sDATURDwhrBwY6wUTnxcjEA0PU="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 310ec6a8bc34..a0c7be275547 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -32,7 +32,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8.unwrapped}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index df4c9f4c4e59..dadd152c13c7 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -53,18 +53,18 @@ let in rustPlatform.buildRustPackage rec { pname = "ecc"; - version = "1.0.12"; + version = "1.0.27"; src = fetchFromGitHub { owner = "eunomia-bpf"; repo = "eunomia-bpf"; rev = "v${version}"; - hash = "sha256-EK/SZ9LNAk88JpHJEoxw12NHje6QdCqO/vT2TfkWlb0="; + hash = "sha256-KfYCC+TJbmjHrV46LoshD+uXcaBVMKk6+cN7TZKKYp4="; }; sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-ymBEzFsMTxKSdJRYoDY3AC0QpgtcMlU0fQV03emCxQc="; + cargoHash = "sha256-t8sPwAha90SMC/SJqZngXD9hpoaWh9e91X/kuHN4G7o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 67bb8474b9f5..1bece593d6cf 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.194.0"; + version = "0.197.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-BjMM2xjDA9rteT1dFE1DENEzM5226GW+Zv2gtZNCzNo="; + hash = "sha256-JHhZFcjnURgt+HqRwy/0rZ2qrzpeX/WGeXJ0arhRDq8="; }; - vendorHash = "sha256-3BVy2e2cbxtWP7yP4UTXvtH1Hr/Vl06e6Dsr+FLhtZg="; + vendorHash = "sha256-f7+IlOcGJL5G52wPZz1oeHmR8LR8XZh6ASV1qi7hXi0="; doCheck = false; diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 62acfc4a55bc..6b8ea3e50f11 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -12,7 +12,7 @@ makeBinaryWrapper, openssl, - libsoup, + libsoup_2_4, webkitgtk_4_0, gst_all_1, apple-sdk_11, @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - libsoup + libsoup_2_4 webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix index f4f2ca6b2ac2..b53f6b761e48 100644 --- a/pkgs/by-name/ep/epic5/package.nix +++ b/pkgs/by-name/ep/epic5/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epic5"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; - hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU="; + hash = "sha256-QiD9Lx4IxbR+w0NFw5cANqN9cvu1QR45wQ87zlV8FNU="; }; buildInputs = diff --git a/pkgs/by-name/ex/extism-cli/package.nix b/pkgs/by-name/ex/extism-cli/package.nix index 36bdd4557d77..933fdeaa8b54 100644 --- a/pkgs/by-name/ex/extism-cli/package.nix +++ b/pkgs/by-name/ex/extism-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-FAnPyhCc1R6Xk195hTfO16WVtYVB6RPp7Ih7+uyRy2s="; + hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg="; }; - vendorHash = "sha256-w8XqHirHfswhlBH/oSrDKLyGdbaiFjQGEZcMH+WVLYo="; + vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix index 4eac63989761..9ef45d07a39f 100644 --- a/pkgs/by-name/fe/fedifetcher/package.nix +++ b/pkgs/by-name/fe/fedifetcher/package.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.12"; + version = "7.1.14"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; + hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index b4c94e54e303..5ff45e5c2199 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.14.21"; + version = "8.14.49"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-sBC2qvtSje2uXzSZAYXBFmycKxf0B6/JZhOvWNyMp20="; + hash = "sha256-pgI6xiTz1Gm5OMUnJsXD/B2eBm3MkPKIYQ6DgyVdwYo="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix index 27a6cf73e76b..32eb0249d55b 100644 --- a/pkgs/by-name/fi/filesender/package.nix +++ b/pkgs/by-name/fi/filesender/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "filesender"; - version = "2.49"; + version = "2.51"; src = fetchFromGitHub { owner = "filesender"; repo = "filesender"; - rev = "filesender-${finalAttrs.version}"; - hash = "sha256-GNhborbwV9G2x7pLDyxGVCtTf4AIaMYQGAKNJPzedzo="; + tag = "filesender-${finalAttrs.version}"; + hash = "sha256-HQ5/Df4F4Gwon0OhlIRTZ0NHTb9SJgQD+BDbH/aIeKw="; }; patches = [ diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 22085eb49017..700e3b9f6134 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -8,19 +8,19 @@ }: let - version = "13.20.2"; + version = "13.28.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-FIflfCSTXm7J2WectS175vc0ccztWa4tE2E2kcbhwJg="; + hash = "sha256-bOuOBzEEfVi+0lGqKgZQVmxKUBWoWWdaQ1jlCR1xBcM="; }; in buildNpmPackage { pname = "firebase-tools"; inherit version src; - npmDepsHash = "sha256-qEerq6rFBN6HmzDS4xQJorzmzapBV/WhzCwG3rHU458="; + npmDepsHash = "sha256-3wc1DPZ+yYlBtUTWpa4XFaetS7caNqX5JFSXkmzHyqg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index b197539cc421..586464b5ad49 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec { "pyopenssl" "pytz" "sqlalchemy" + "ua-parser" ]; dependencies = diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index 7a9c347c8d45..deec18b18a51 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.108.0"; + version = "0.111.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-9pPDoXYZCcMnusBfQ1PQ8l/ZFvPNTOA8dRJALXY1Kho="; + hash = "sha256-/oIY7Sf7XNyoxMsaEqHgSPt8AxWDeMtMsVQ0r/vlICQ="; }; - vendorHash = "sha256-U6ogqAweU2DZb26Ct4K/1TnCGRn//p11nVkFKzC+tj0="; + vendorHash = "sha256-Zuk+WreO15tGrSYHkuu6h6ZpM3iL+dPyf13LIeVEz44="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix index 5e78f6923f30..9157d4cf28ba 100644 --- a/pkgs/by-name/fl/flent/package.nix +++ b/pkgs/by-name/fl/flent/package.nix @@ -4,7 +4,7 @@ fetchPypi, procps, qt5, - xvfb-run, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "flent"; @@ -25,28 +25,15 @@ python3Packages.buildPythonApplication rec { qtpy ]; - nativeCheckInputs = [ - python3Packages.mock - xvfb-run - ]; - - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ python3Packages.unittestCheckHook ]; + preCheck = '' # we want the gui tests to always run sed -i 's|self.skip|pass; #&|' unittests/test_gui.py - export XDG_RUNTIME_DIR=$(mktemp -d) - export HOME=$(mktemp -d) - cat >test-runner <=0.42 diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix new file mode 100644 index 000000000000..39383430208c --- /dev/null +++ b/pkgs/by-name/li/libppd/package.nix @@ -0,0 +1,48 @@ +{ + autoreconfHook, + cups, + fetchFromGitHub, + ghostscript, + libcupsfilters, + libz, + mupdf, + pkg-config, + poppler_utils, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libppd"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "libppd"; + rev = version; + hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + buildInputs = [ + ghostscript + libcupsfilters + mupdf + libz + ]; + configureFlags = [ + "--with-mutool-path=${mupdf}/bin/mutool" + "--with-pdftops=pdftops" + "--with-pdftops-path=${poppler_utils}/bin/pdftops" + "--with-gs-path=${ghostscript}/bin/gs" + "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" + ]; + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 3a13c53cf586..8cd47c2fa0e1 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -1,36 +1,72 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsNoGuiHook, gobject-introspection -, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 -, json-glib, libunistring }: +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsNoGuiHook, + gobject-introspection, + glib, + systemd, + udev, + libevdev, + gitMinimal, + check, + valgrind, + swig, + python3, + json-glib, + libunistring, +}: stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "libratbag"; - rev = "v${version}"; - sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew="; + owner = "libratbag"; + repo = "libratbag"; + rev = "v${version}"; + hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ - meson ninja pkg-config gitMinimal swig check valgrind wrapGAppsNoGuiHook gobject-introspection + meson + ninja + pkg-config + gitMinimal + swig + check + valgrind + wrapGAppsNoGuiHook + gobject-introspection ]; buildInputs = [ - glib systemd udev libevdev json-glib libunistring - (python3.withPackages (ps: with ps; [ evdev pygobject3 ])) + glib + systemd + udev + libevdev + json-glib + libunistring + (python3.withPackages ( + ps: with ps; [ + evdev + pygobject3 + ] + )) ]; mesonFlags = [ "-Dsystemd-unit-dir=./lib/systemd/system/" ]; - meta = with lib; { + meta = { description = "Configuration library for gaming mice"; - homepage = "https://github.com/libratbag/libratbag"; - license = licenses.mit; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + homepage = "https://github.com/libratbag/libratbag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/li/libxplayer-plparser/package.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix index 9a1ef21c014e..51358b45bbda 100644 --- a/pkgs/by-name/li/libxplayer-plparser/package.nix +++ b/pkgs/by-name/li/libxplayer-plparser/package.nix @@ -6,7 +6,7 @@ , gobject-introspection , gmime3 , libxml2 -, libsoup +, libsoup_2_4 , pkg-config }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmime3 libxml2 - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/li/libzapojit/package.nix b/pkgs/by-name/li/libzapojit/package.nix index cb7038d5355c..5de315b79457 100644 --- a/pkgs/by-name/li/libzapojit/package.nix +++ b/pkgs/by-name/li/libzapojit/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup_2_4, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc + propagatedBuildInputs = [ glib json-glib librest libsoup_2_4 gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 1cf6fe437eae..ce2b8cb7ffc6 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "0.2.9"; + version = "0.2.10"; in rustPlatform.buildRustPackage { pname = "lla"; @@ -17,12 +17,12 @@ rustPlatform.buildRustPackage { owner = "triyanox"; repo = "lla"; rev = "refs/tags/v${version}"; - hash = "sha256-bemu4MuZYmn6LDIGxCAxIuS78alz8UE6qHhLoxtZSUk="; + hash = "sha256-zHtHlEAh170t05DO5b/vspODkqx5G9C3nt5G8dtm8wI="; }; nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-sjJUG32jchAG/q4y649PyTJ2kqjT+0COSvO2QM6GnV0="; + cargoHash = "sha256-ar7NEQKTdxM96dT9b9BBfYZA3zVlhN6OciKRo4ZhBSU="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/ls/lsb-release/lsb_release.sh b/pkgs/by-name/ls/lsb-release/lsb_release.sh index ae524181e88a..2031efc8b654 100644 --- a/pkgs/by-name/ls/lsb-release/lsb_release.sh +++ b/pkgs/by-name/ls/lsb-release/lsb_release.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -o errexit set -o nounset diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index f79c6527539a..6973d50e99aa 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -1,22 +1,26 @@ -{ substituteAll, lib -, coreutils, getopt +{ + replaceVars, + runCommand, + lib, + runtimeShell, + coreutils, + getopt, }: -substituteAll { - name = "lsb_release"; - - src = ./lsb_release.sh; - - dir = "bin"; - isExecutable = true; - - inherit coreutils getopt; - - meta = with lib; { - description = "Prints certain LSB (Linux Standard Base) and Distribution information"; - mainProgram = "lsb_release"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; -} +runCommand "lsb_release" + { + meta = with lib; { + description = "Prints certain LSB (Linux Standard Base) and Distribution information"; + mainProgram = "lsb_release"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; + } + '' + install -Dm 555 ${ + replaceVars ./lsb_release.sh { + inherit runtimeShell coreutils getopt; + } + } $out/bin/lsb_release + '' diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 6ff338eb8a80..3a6abac16f2b 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-JOIlEBNEXzYFO2gC3s9R2Y5aK0av6Kl0gQDWN7Kw7uk="; + hash = "sha256-pAmNzc9GlkUB3FxYXiBqbS9Ym2wg3lBLbBKio6WezyQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix index 3f72762eec95..daa459636fb5 100644 --- a/pkgs/by-name/lu/lurk/package.nix +++ b/pkgs/by-name/lu/lurk/package.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "jakwai01"; - repo = pname; - rev = "v${version}"; + repo = "lurk"; + tag = "v${version}"; hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs="; }; @@ -22,16 +22,19 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/ls' 'ls' ''; - meta = with lib; { + meta = { + changelog = "https://github.com/jakwai01/lurk/releases/tag/v${version}"; description = "Simple and pretty alternative to strace"; - mainProgram = "lurk"; homepage = "https://github.com/jakwai01/lurk"; - changelog = "https://github.com/jakwai01/lurk/releases/tag/${src.rev}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.agpl3Only; + mainProgram = "lurk"; + maintainers = with lib.maintainers; [ + figsoda + ]; platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; }; } diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 8cead8d79bed..3491375298e3 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -43,19 +43,19 @@ }: let pname = "mangayomi"; - version = "0.3.75"; + version = "0.3.8"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-kVAtUXEysaCJSLobXlgAgK59pgLq8Ze/XDqQNNdKdzg="; + hash = "sha256-TOCDGmJ5tlpcGS8NeVdIdx946rM1/ItQVY9OnDS6uZ0="; }; rustDep = rustPlatform.buildRustPackage { inherit pname version src; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-b4PRFe8FgP/PXHwSw2qmderPRFCBC1ISQuf8uZcsxpY="; + cargoHash = "sha256-6Iraw5gtlVW3iSrT2zQh6JLubVTZy/y8/5quXKee2Ko="; passthru.libraryPath = "lib/librust_lib_mangayomi.so"; }; @@ -90,7 +90,7 @@ flutter324.buildFlutterApplication { }; gitHashes = { - desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; + desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; media_kit_libs_windows_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; media_kit_native_event_loop = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index a2f9c0042a36..4f91358cf451 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -399,10 +399,10 @@ "desktop_webview_window": { "dependency": "direct main", "description": { - "path": ".", - "ref": "no_texture", - "resolved-ref": "109f1739727a71d8da60696143f5af91061faab2", - "url": "https://github.com/Predidit/linux_webview_window.git" + "path": "packages/desktop_webview_window", + "ref": "main", + "resolved-ref": "2aa8d449881974182d033df9635cf7c198d2553a", + "url": "https://github.com/kodjodevf/desktop_webview_window.git" }, "source": "git", "version": "0.2.4" @@ -441,11 +441,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.7" }, "exception_templates": { "dependency": "transitive", @@ -836,11 +836,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "8ae664a70174163b9f65ea68dd8673e29db8f9095de7b5cd00e167c621f4fef5", + "sha256": "8660b74171fafae4aa8202100fa2e55349e078281dadc73a241eb8e758534d9d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.0" + "version": "14.6.1" }, "google_fonts": { "dependency": "direct main", @@ -1379,11 +1379,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "sha256": "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.12" + "version": "2.2.14" }, "path_provider_foundation": { "dependency": "transitive", @@ -1788,11 +1788,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "sky_engine": { "dependency": "transitive", diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix index e24e902abc03..5365dea34609 100644 --- a/pkgs/by-name/ma/markets/package.nix +++ b/pkgs/by-name/ma/markets/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala , wrapGAppsHook3 -, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup +, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib glib-networking gtk3 json-glib libgee libhandy - libsoup + libsoup_2_4 ]; postPatch = '' diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 4847c3dff08d..c3745ba58f47 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -93,14 +93,14 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.84.2"; - MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466"; + version = "0.87.2"; + MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = "materialize"; - rev = "refs/tags/v${version}"; - hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs="; + tag = "v${version}"; + hash = "sha256-EHhN+avUxzwKU48MubiMM40W9J93yZlNqV+xeP44dl0="; fetchSubmodules = true; }; @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-EHVuwVYPZKaoP3GYtJpYJaKG3CLsy9CWuEmajF4P7Qc="; + cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws="; nativeBuildInputs = [ @@ -156,16 +156,19 @@ rustPlatform.buildRustPackage rec { # Skip tests that use the network checkFlags = [ "--exact" - "--skip test_client" - "--skip test_client_errors" - "--skip test_client_all_subjects" - "--skip test_client_subject_and_references" - "--skip test_no_block" - "--skip test_safe_mode" - "--skip test_tls" + "--skip=test_client" + "--skip=test_client_errors" + "--skip=test_client_all_subjects" + "--skip=test_client_subject_and_references" + "--skip=test_no_block" + "--skip=test_safe_mode" + "--skip=test_tls" ]; - cargoBuildFlags = [ "--bin environmentd --bin clusterd" ]; + cargoBuildFlags = [ + "--bin=clusterd" + "--bin=environmentd" + ]; postInstall = '' install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service @@ -186,11 +189,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://materialize.com"; description = "Streaming SQL materialized view engine for real-time applications"; license = lib.licenses.bsl11; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - ]; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ petrosagg ]; mainProgram = "environmentd"; }; diff --git a/pkgs/by-name/me/meteo/package.nix b/pkgs/by-name/me/meteo/package.nix index e62d4edfe97f..226c8078c64e 100644 --- a/pkgs/by-name/me/meteo/package.nix +++ b/pkgs/by-name/me/meteo/package.nix @@ -15,7 +15,7 @@ , gtk3 , json-glib , libappindicator -, libsoup +, libsoup_2_4 , webkitgtk_4_0 }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libappindicator - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index e557a0614d9f..161d584cc007 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - hash = "sha256-cFoUa4ZpPy1MldlTeY9ISXi9ilulmhmaH5mapUDBzE8="; + hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w="; fetchSubmodules = true; # remove unused libraries from rp2 port's SDK. we leave this and the other diff --git a/pkgs/by-name/mi/midori-unwrapped/package.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix index 3a2a67035328..74f25b636df0 100644 --- a/pkgs/by-name/mi/midori-unwrapped/package.nix +++ b/pkgs/by-name/mi/midori-unwrapped/package.nix @@ -12,7 +12,7 @@ , webkitgtk_4_0 , sqlite , gsettings-desktop-schemas -, libsoup +, libsoup_2_4 , glib-networking , json-glib , libarchive @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (libsoup.override { gnomeSupport = true; }) + (libsoup_2_4.override { gnomeSupport = true; }) gcr glib-networking gsettings-desktop-schemas diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 7ebd3575944f..ca9ed7870579 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4="; + hash = "sha256-rRNikxSgr3isXkp/2oqPQ3JkugxuLgYlcT5c+4yIYBc="; }; - cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY="; + cargoHash = "sha256-ksdCvl8x6KfqNRnTeIKkL6nnr4d53wMv7pr2rupVkTI="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix new file mode 100644 index 000000000000..67a77b6e00b3 --- /dev/null +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, +}: + +buildGoModule rec { + pname = "minio-warp"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "minio"; + repo = "warp"; + rev = "v${version}"; + hash = "sha256-Zfjj/cYxucjuJRzER6MczQFqu8kdfUUXqC0mcQFbk0Q="; + }; + + vendorHash = "sha256-GD9Om5jymrRbeCVGNXtaam5Dmfg99CtEeiAFENhwyyY="; + + # See .goreleaser.yml + ldflags = [ + "-s" + "-w" + "-X github.com/minio/warp/pkg.ReleaseTag=v${version}" + "-X github.com/minio/warp/pkg.CommitID=${src.rev}" + "-X github.com/minio/warp/pkg.Version=${version}" + "-X github.com/minio/warp/pkg.ShortCommitID=${src.rev}" + "-X github.com/minio/warp/pkg.ReleaseTime=1970-01-01T00:00:00Z" + ]; + + postInstall = '' + mv $out/bin/warp $out/bin/minio-warp + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "S3 benchmarking tool"; + homepage = "https://github.com/minio/warp"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ christoph-heiss ]; + mainProgram = "minio-warp"; + }; +} diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix index 214ebb999785..b0836d514e2e 100644 --- a/pkgs/by-name/mi/mint-l-theme/package.nix +++ b/pkgs/by-name/mi/mint-l-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; + hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 5b2e897ae7e3..bbe9444f0489 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,18 +30,25 @@ stdenv.mkDerivation (finalAttrs: { version = "0.3.7"; src = fetchFromGitHub { - owner = "mattkae"; + owner = "miracle-wm-org"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ - # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release + # Remove when version > 0.3.7 (fetchpatch { - name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch"; - url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch"; - hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU="; + name = "0001-miracle-wm-Dont-override-PKG_CONFIG_PATH.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/0a8809d4362e1d3abbea6e29fd1234c8fa981bfb.patch"; + hash = "sha256-Fy/fDmV1uXRt4omxccpFkZb0vE8iHYSS9A7E+PEFBOM="; + }) + + # Remove when version > 0.3.7 + (fetchpatch { + name = "0002-miracle-wm-Fix-mir-2.19-support.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/a9db8b539a5396e9df6f6f009cbabcbb053f2b05.patch"; + hash = "sha256-VxUVpwBSHuLzs0yEQ7gStpMnHRJJtZ/Shmjb2un3qI0="; }) ]; diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index fe41c1b313b2..830b8c28d7e2 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "24.10.1"; + version = "24.11.1"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA="; + hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ="; }; postPatch = '' diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix new file mode 100644 index 000000000000..b27b13490a04 --- /dev/null +++ b/pkgs/by-name/mi/mitra/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: + +rustPlatform.buildRustPackage rec { + pname = "mitra"; + version = "3.9.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "silverpill"; + repo = "mitra"; + rev = "v${version}"; + hash = "sha256-reBG9h3jI4ONxYIwM2QdXlTC8ohmSrPm18sLOeI/2wY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-WoJzFhxBDHuUNGaNsqieev93hg0Eo604tAM0HZJv9tA="; + + # MEMO: mitra v3.9.0 tests failed with cargo option, "--offline" + doCheck = false; + + RUSTFLAGS = [ + # MEMO: mitra use ammonia crate with unstable rustc flag + "--cfg=ammonia_unstable" + ]; + + buildFeatures = [ + "production" + ]; + + meta = { + description = "Federated micro-blogging platform"; + homepage = "https://codeberg.org/silverpill/mitra"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ haruki7049 ]; + mainProgram = "mitra"; + }; +} diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 7d4cb724ea01..0bda723ba18c 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.81"; + version = "10.83"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-sI2u+H/ewva9r+g5xSNqal0DMul+a9Y4FV6dEzulvSI="; + hash = "sha256-QPd3YlQ2IYAqIIau3RVb2FcdE4obQjg5bZi6CUsDyHU="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index a6b3f3eb21e7..054ba5eb452e 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -20,17 +20,18 @@ let apprise python-periphery ldap3 + importlib-metadata ] ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.8.0-unstable-2023-12-27"; + version = "0.9.3-unstable-2024-11-17"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "c226e9c1e44d65ff6ea400b81e3cedba7f637976"; - sha256 = "sha256-wdf4uab8pJEWaX6PFN9Y9pykmylmxJ4Oo5pwSQcyjCc="; + rev = "ccfe32f2368a5ff6c2497478319909daeeeb8edf"; + sha256 = "sha256-aCYE3EmflMRIHnGnkZ/0+zScVA5liHSbavScQ7XRf/4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 77ca0a63f023..10f2cda2ece6 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "47.1"; + version = "47.2"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; - rev = "${version}"; - hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE="; + rev = "refs/tags/v${version}"; + hash = "sha256-LvkYLY8PYajCb1x1p0HfpKoMq+t4XwH/w9Hvy9YXzk0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 7fae4355255b..f0ea612c309b 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -14,7 +14,7 @@ libXtst, libevdev, gtk3, - libsoup, + libsoup_2_4, webkitgtk_4_0, }: @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { # Tauri deps gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index dbb920db3495..8a5f309fb7fb 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.24.1"; + version = "2.24.3"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; + hash = "sha256-GRt0diDt8bEeMfDwiEtYyR+20/bJAVcDal9eGfvk340="; }; patches = [ # Fix build errors from deprecated `QByteArray::count()`, `QVariant::type()`, `QEventPoint::pos()` (#9961) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 36cc397f85a6..4881a247d59e 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.394"; + version = "0.0.396"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-ktXpFhE/+DmlqIaH8R6zu4Y1I7sr8NYeZP8lWeNN0bA="; + hash = "sha256-hDCHu/RlZfuEL20wO5V7cBcKQKswoUBwTp531rlYN5A="; }; vendorHash = "sha256-E9RhELIGOjFa+gDinl4xDR3ckTtdFLqVoAT0HQoI38I="; diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix index cc58991bb325..f61f5a1d179f 100644 --- a/pkgs/by-name/nd/ndcurves/package.nix +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndcurves"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "ndcurves"; rev = "v${finalAttrs.version}"; - hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs="; + hash = "sha256-dDH2XpnlBlhG5Q8N9Aljxvf/K9jFuiAx0lyBIcXNOZE="; }; outputs = [ diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix index c470b12e114d..f8480813a7de 100644 --- a/pkgs/by-name/ne/nerdfetch/package.nix +++ b/pkgs/by-name/ne/nerdfetch/package.nix @@ -5,13 +5,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; rev = "v${finalAttrs.version}"; - hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas="; + hash = "sha256-Ptd699Q2kX+04TGnChQK45dBf0W1QUFk7vHpRl3kFKo="; }; dontUnpack = true; diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index 48d62500e116..6b9773cb60db 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -36,7 +36,7 @@ let cmakeFlags = [ "-DCORECLR_DIR=${coreclr-src}/src/coreclr" - "-DDOTNET_DIR=${dotnet-sdk.unwrapped}/share/dotnet" + "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet" "-DBUILD_MANAGED=0" ]; }; diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 64e1e255c30b..f17bd6487ddd 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -18,7 +18,7 @@ # downstream dependencies, for testing , curl -, libsoup +, libsoup_3 }: # Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit curl libsoup; + inherit curl libsoup_3; }; meta = with lib; { diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index f33aa1b03a42..1c798122be50 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.2"; + version = "2.5.3"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-xRSq6lBZ6jHtNve027uF2uNs3/40s0YdFN9F9O7m5VU="; + hash = "sha256-OrsDL5zpMDV2spxC0jtpuhaSWBIS6XBEWZuVxHAS/QM="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 1d415901d616..01fe763a348d 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.50"; + version = "0.9.53"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; - rev = "refs/tags/v${version}"; - hash = "sha256-/WJpxFmQ6ED/PWW9/qIp5VheBgAukLIwRSdOxfPoyKM="; + tag = "v${version}"; + hash = "sha256-hku5a2np7J/7jt9oL77GLasslFk1VRPe3cGG6xmQGwY="; }; # No tests diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 77071b9c3c3f..43c36d5d69ee 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -41,13 +41,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-X1xGo054+MpThvZzeg/F+IBczY1wn/gTjcq+j1JztDg="; + hash = "sha256-WbRs7CdPKIEqxJUZjPT4ZzuWBl+OfGu2dzwjNVrSgVw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index 55857333e65e..935686a52ecc 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -1,8 +1,10 @@ { lib, autoreconfHook, + coreutils, curl, fetchFromGitHub, + fetchpatch, installShellFiles, ldc, libnotify, @@ -26,6 +28,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Lek1tW0alQQvlOHpz//M/y4iJY3PWRkcmXGLwjCLozk="; }; + patches = [ + # remove when updating to v2.5.4 + (fetchpatch { + name = "fix-openssl-version-check-error.patch"; + url = "https://github.com/abraunegg/onedrive/commit/d956318b184dc119d65d7a230154df4097171a6d.patch"; + hash = "sha256-LGmKqYgFpG4MPFrHXqvlDp7Cxe3cEGYeXXH9pCXtGkU="; + }) + ]; + outputs = [ "out" "doc" @@ -57,6 +68,9 @@ stdenv.mkDerivation (finalAttrs: { installShellCompletion --bash --name onedrive contrib/completions/complete.bash installShellCompletion --fish --name onedrive contrib/completions/complete.fish installShellCompletion --zsh --name _onedrive contrib/completions/complete.zsh + + substituteInPlace $out/lib/systemd/user/onedrive.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep" + substituteInPlace $out/lib/systemd/system/onedrive@.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep" ''; passthru = { diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index d2164ff8c261..0057e06040b7 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "refs/tags/v${version}"; - hash = "sha256-LQFedDcECmS142tGH9+/7ic+wKTeMuysK2fjGmvYPYQ="; + hash = "sha256-9N/t8hxODM6Dk/eMKS26/2Sh1lJVkq9pNkPcEtbXqb4="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-KeHMt51QvF5qfHKQpEbM0ukGm34xo3TFcXKeZ3CrmHM="; + npmDepsHash = "sha256-ThOGBurFjndBZcdpiGugdXpv1YCwCN7s3l2JjSk/hY0="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -148,8 +148,11 @@ python312.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ]; - passthru.tests = { - inherit (nixosTests) open-webui; + passthru = { + tests = { + inherit (nixosTests) open-webui; + }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/op/open-webui/update.sh b/pkgs/by-name/op/open-webui/update.sh new file mode 100755 index 000000000000..51c7871a04c1 --- /dev/null +++ b/pkgs/by-name/op/open-webui/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git curl jq common-updater-scripts prefetch-npm-deps + +set -eou pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +path="$nixpkgs/pkgs/by-name/op/open-webui/package.nix" +version="$(curl --silent "https://api.github.com/repos/open-webui/open-webui/releases" | jq '.[0].tag_name' --raw-output)" + +update-source-version open-webui "${version:1}" --file="$path" + +# Fetch npm deps +tmpdir=$(mktemp -d) +curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package-lock.json" +curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package.json" +pushd $tmpdir +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' "$path" +popd +rm -rf $tmpdir + diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 171434d7a30b..a0876ac951b4 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,15 +11,15 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.21.6"; + version = "0.21.7"; pyproject = true; src = fetchFromGitHub { inherit version; owner = "openapi-generators"; repo = "openapi-python-client"; - rev = "refs/tags/v${version}"; - hash = "sha256-hmVRPQ3+20ZBRCkQltX+S+pGGy2unsBSztyif93sKsw="; + tag = "v${version}"; + hash = "sha256-V3tvAyojSSijbqVfsodk7eiyUBGZOjf1stkedfwTeOQ="; }; nativeBuildInputs = diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index ef8c6f5b8232..9c5fc9bd9652 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -3,39 +3,36 @@ buildGoModule, buildNpmPackage, fetchFromGitHub, + fetchpatch, moreutils, - npm-lockfile-fix, jq, git, }: let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.7.5"; + version = "1.8.3"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; rev = "v${version}"; - hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew="; - - # follow https://github.com/thomiceli/opengist/pull/350 and remove here - postFetch = '' - ${lib.getExe npm-lockfile-fix} $out/package-lock.json - ''; + hash = "sha256-Wpn9rqOUwbwi6pbPTnVzHb+ip3ay9WykEZDyHNdXYJU="; }; frontend = buildNpmPackage { pname = "opengist-frontend"; inherit version src; - - nativeBuildInputs = [ - moreutils - jq + patches = [ + # fix lock file + # https://github.com/thomiceli/opengist/pull/395 + (fetchpatch { + url = "https://github.com/thomiceli/opengist/pull/395/commits/f77c624f73f18010c7e4360287d0a3c013c21c9d.patch"; + hash = "sha256-oCMt1HptH0jsi2cvv8wEP0+bpujx1jBxCjw0KMDGFfk="; + }) ]; - # npm complains of "invalid package". shrug. we can give it a version. - preBuild = '' - jq '.version = "${version}"' package.json | sponge package.json + postPatch = '' + ${lib.getExe jq} '.version = "${version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json ''; # copy pasta from the Makefile upstream, seems to be a workaround of sass @@ -50,13 +47,13 @@ let cp -R public $out ''; - npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w="; + npmDepsHash = "sha256-fj2U8oRNfdIEnRkAOQQGiPyQFuWltLGkMzT2IQO60v0="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws="; + vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw="; tags = [ "fs_embed" ]; ldflags = [ "-s" @@ -73,11 +70,20 @@ buildGoModule { export OG_OPENGIST_HOME=$(mktemp -d) ''; + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + postPatch = '' cp -R ${frontend}/public/{manifest.json,assets} public/ ''; - passthru.frontend = frontend; + passthru = { + inherit frontend; + updateScript = ./update.sh; + }; meta = { description = "Self-hosted pastebin powered by Git"; diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh new file mode 100755 index 000000000000..ad3ac9ca639a --- /dev/null +++ b/pkgs/by-name/op/opengist/update.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts + +# shellcheck shell=bash + +set -eou pipefail + +NIXPKGS_DIR="$PWD" +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" + +# Get latest release +OPENGIST_RELEASE=$( + curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/thomiceli/opengist/releases/latest +) + +# Get release information +latestVersion=$(echo "$OPENGIST_RELEASE" | jq -r ".tag_name") +latestVersion="${latestVersion:1}" # remove first char 'v' + +oldVersion=$(nix eval --raw -f "$NIXPKGS_DIR" opengist.version) + +if [[ "$oldVersion" == "$latestVersion" ]]; then + echo "opengist is up-to-date: ${oldVersion}" + exit 0 +fi + +echo "Updating opengist $oldVersion -> $latestVersion" + +update-source-version opengist "${latestVersion}" + +pushd "$SCRIPT_DIR" >/dev/null || exit 1 + +## npm hash +rm -f package{,-lock}.json +curl -sLO "https://raw.githubusercontent.com/thomiceli/opengist/refs/tags/v$latestVersion/package-lock.json" + +npmDepsHash="$(prefetch-npm-deps package-lock.json)" +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' --in-place package.nix + +popd >/dev/null + +# nix-prefetch broken due to ninja finalAttrs.src.rev +# nix-update with goModules broken for this package + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix" +} + +setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash + +set +e +VENDOR_HASH=$(nix-build --no-out-link -A opengist "$NIXPKGS_DIR" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash "${VENDOR_HASH}" +else + echo "Update failed. VENDOR_HASH is empty." + exit 1 +fi diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index ab5e289280af..e765632d177c 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "opnborg"; - version = "0.1.24"; + version = "0.1.44"; src = fetchFromGitHub { owner = "paepckehh"; repo = "opnborg"; rev = "v${version}"; - hash = "sha256-lJPu1Ixx1BUWrZ+h6AuxLyVMScKAmcp+sK2duOxC9e0="; + hash = "sha256-I8twrDeAEfsUOKE7+Jj5IqVjkIv9oNBDZjvGx5iwHRQ="; }; vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc="; diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index 9b72f34fd761..9bf7ec4b1d5e 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.68.2"; + version = "2.68.4"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-aCGdBG3AqD8PJHIHhie0KELQNRcD8JQfmjM2bDEjFbo="; + hash = "sha256-VEYeC3gtjBxkDYH/fEsdKtIInB8E2pcHokinspdj10Q="; }; vendorHash = null; diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 0be196597c90..5beaf910e425 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, libsoup_2_4, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gtk3 - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index fd09015f67c7..dff3820b4112 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -12,7 +12,7 @@ , systemd , xz , e2fsprogs -, libsoup +, libsoup_2_4 , glib-networking , wrapGAppsNoGuiHook , gpgme @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { glib systemd e2fsprogs - libsoup + libsoup_2_4 glib-networking gpgme fuse3 diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 05cf017825a7..be11066b305e 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -4,7 +4,7 @@ callPackage, pkg-config, openssl, - libsoup, + libsoup_3, webkitgtk_4_1, fetchFromGitHub, libayatana-appindicator, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl webkitgtk_4_1 - libsoup + libsoup_3 ]; env = { diff --git a/pkgs/by-name/pa/paperjam/package.nix b/pkgs/by-name/pa/paperjam/package.nix new file mode 100644 index 000000000000..f71bae04ae81 --- /dev/null +++ b/pkgs/by-name/pa/paperjam/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + qpdf, + libiconv, + libpaper, + asciidoc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "paperjam"; + version = "1.2.1"; + + src = fetchurl { + url = "https://mj.ucw.cz/download/linux/paperjam-${finalAttrs.version}.tar.gz"; + hash = "sha256-vTjtNTkBHwfoRDshmFu1zZfGVuEtk2NXH5JdA5Ekg5s="; + }; + + buildInputs = [ + qpdf + libpaper + asciidoc + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + + makeFlags = [ + "PREFIX=$(out)" + # prevent real build date which is impure + "BUILD_DATE=\" + "BUILD_COMMIT=\" + ]; + + # provide backward compatible PointerHolder, suppress deprecation warnings + env.NIX_CFLAGS_COMPILE = "-DPOINTERHOLDER_TRANSITION=1"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + + meta = { + homepage = "https://mj.ucw.cz/sw/paperjam/"; + description = "Program for transforming PDF files"; + longDescription = '' + PaperJam is a program for transforming PDF files. It can re-arrange + pages, scale and rotate them, put multiple pages on a single sheet, draw + cropmarks, and many other tricks. + ''; + license = lib.licenses.gpl2Plus; + mainProgram = "paperjam"; + maintainers = with lib.maintainers; [ cbley ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 6f9c04ae0fb9..ad04ac2b30ed 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_09_06.6b38f07"; + version = "2024_10_30.ee7d0b6"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-Qf1neJOkYXR5p9Owk60qtc22A+au4EY45Qt9PfJ+Lrs="; + hash = "sha256-x5WIqtWBfVt7+u47bfT2g92ghhaIjYt2GW279+sbKdE="; }; postPatch = '' diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix index 11ff17f0d76b..d657141d7a4e 100644 --- a/pkgs/by-name/pe/pekwm/package.nix +++ b/pkgs/by-name/pe/pekwm/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pekwm"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; rev = "release-${finalAttrs.version}"; - hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; + hash= "sha256-l43xxCowSEBQjwg7hjpBwybFB12ESOep6hqdzSsD3YI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index dc3b9d470b2c..9bf5dc0a73c2 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "11.3.6"; + version = "11.5.0"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-bJdatRBrORR7KPcpRVIPYo2picQSfh8Pa0waeOZAH8Q="; + hash = "sha256-krlQu5zDxAjpM3zwaqty1p7ZJccnX8+Ru+AsXKSbcDY="; }; - vendorHash = "sha256-wRgYEwbvvEGCp7/Rat+WUkvv04JqFHssHXtJjeQZo3o="; + vendorHash = "sha256-kz8vSl9OO4kTSYlJa79fca5XVdhyUwVFCyvdJdbYLAQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix new file mode 100644 index 000000000000..726d8afd7ada --- /dev/null +++ b/pkgs/by-name/pi/pilipalax/package.nix @@ -0,0 +1,126 @@ +{ + autoPatchelfHook, + lib, + fetchFromGitHub, + flutter324, + mpv, + libass, + ffmpeg, + libplacebo, + libunwind, + shaderc, + vulkan-loader, + lcms, + libdovi, + libdvdnav, + libdvdread, + mujs, + libbluray, + lua, + rubberband, + libuchardet, + zimg, + alsa-lib, + openal, + pipewire, + libpulseaudio, + libcaca, + libdrm, + mesa, + libXScrnSaver, + nv-codec-headers-11, + libXpresent, + libva, + libvdpau, + pkg-config, + makeDesktopItem, + wrapGAppsHook3, + copyDesktopItems, + xdg-user-dirs, +}: +flutter324.buildFlutterApplication rec { + pname = "pilipalax"; + version = "1.0.22-beta.12+174"; + + src = fetchFromGitHub { + owner = "orz12"; + repo = "PiliPalaX"; + tag = version; + hash = "sha256-Qjqyg9y5R70hODGfVClS505dJwexL0BbUm6lXSHzhJs="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + desktopItems = [ + (makeDesktopItem { + name = "pilipalax"; + exec = "pilipala"; + icon = "pilipalax"; + genericName = "PiliPalaX"; + desktopName = "PiliPalaX"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + mpv + libass + ffmpeg + libplacebo + libunwind + shaderc + vulkan-loader + lcms + libdovi + libdvdnav + libdvdread + mujs + libbluray + lua + rubberband + libuchardet + zimg + alsa-lib + openal + pipewire + libpulseaudio + libcaca + libdrm + mesa + libXScrnSaver + libXpresent + nv-codec-headers-11 + libva + libvdpau + ]; + + gitHashes = { + ns_danmaku = "sha256-OHlKscybKSLS1Jd1S99rCjHMZfuJXjkQB8U2Tx5iWeA="; + auto_orientation = "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng="; + mime = "sha256-tqFOH85YTyxtp0LbknScx66CvN4SwYKU6YxYQMNeVs4="; + }; + + postInstall = '' + install -Dm644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/pilipalax.png + ''; + + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \ + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + + meta = { + description = "Third-party BiliBili client developed with Flutter"; + homepage = "https://github.com/orz12/PiliPalaX"; + mainProgram = "pilipala"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/pi/pilipalax/pubspec.lock.json b/pkgs/by-name/pi/pilipalax/pubspec.lock.json new file mode 100644 index 000000000000..64f22e5a0f0a --- /dev/null +++ b/pkgs/by-name/pi/pilipalax/pubspec.lock.json @@ -0,0 +1,2337 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.7.0" + }, + "animations": { + "dependency": "direct main", + "description": { + "name": "animations", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.11" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.3" + }, + "app_links": { + "dependency": "direct main", + "description": { + "name": "app_links", + "sha256": "ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.3.2" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.4" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.5.0" + }, + "asn1lib": { + "dependency": "transitive", + "description": { + "name": "asn1lib", + "sha256": "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.5.3" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.18.15" + }, + "audio_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_session": { + "dependency": "direct main", + "description": { + "name": "audio_session", + "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.21" + }, + "auto_orientation": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "4d28c7d6dad6c099a44058527ddc65405a94b4d0", + "url": "https://github.com/orz12/auto_orientation.git" + }, + "source": "git", + "version": "2.3.1" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.12" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "8.9.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.1" + }, + "catcher_2": { + "dependency": "direct main", + "description": { + "name": "catcher_2", + "sha256": "9e5b5f0f1c06d48a83cbedb15d7b5fc0d785c6f3b835c5d7b1cc61b839d901ea", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.0" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.2" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.4" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cookie_jar": { + "dependency": "direct main", + "description": { + "name": "cookie_jar", + "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.8" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.17.3" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_sliding_segmented_control": { + "dependency": "direct main", + "description": { + "name": "custom_sliding_segmented_control", + "sha256": "53c3e931c3ae1f696085d1ec70ac8e934da836595a9b7d9b88fdd0fcbf2a5574", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.8.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.7.10" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_cookie_manager": { + "dependency": "direct main", + "description": { + "name": "dio_cookie_manager", + "sha256": "e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.1" + }, + "dio_http2_adapter": { + "dependency": "direct main", + "description": { + "name": "dio_http2_adapter", + "sha256": "4c99b7b6960199d836c2ab906b6d2e890a45b31fc67f54f45b3088eabaaa59a1", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.5.3" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.0" + }, + "dismissible_page": { + "dependency": "direct main", + "description": { + "name": "dismissible_page", + "sha256": "5b2316f770fe83583f770df1f6505cb19102081c5971979806e77f2e507a9958", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.7.0" + }, + "easy_debounce": { + "dependency": "direct main", + "description": { + "name": "easy_debounce", + "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.3" + }, + "encrypt": { + "dependency": "direct main", + "description": { + "name": "encrypt", + "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "5.0.3" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "8.2.1" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.5" + }, + "extended_list": { + "dependency": "transitive", + "description": { + "name": "extended_list", + "sha256": "fa7bcb2645b7d6849918d499fda6ea917cda85e43b2e06dfec2a29b649722974", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.2" + }, + "extended_list_library": { + "dependency": "transitive", + "description": { + "name": "extended_list_library", + "sha256": "cb424a04464e89bd6737f9ae025029bd8e913c7bf37101ad10c2defe0238d842", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.0" + }, + "extended_nested_scroll_view": { + "dependency": "direct main", + "description": { + "name": "extended_nested_scroll_view", + "sha256": "835580d40c2c62b448bd14adecd316acba469ba61f1510ef559d17668a85e777", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.2.1" + }, + "extended_text": { + "dependency": "direct main", + "description": { + "name": "extended_text", + "sha256": "b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "14.1.0" + }, + "extended_text_library": { + "dependency": "transitive", + "description": { + "name": "extended_text_library", + "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "12.0.0" + }, + "fading_edge_scrollview": { + "dependency": "direct overridden", + "description": { + "name": "fading_edge_scrollview", + "sha256": "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.1.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "7.0.0" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.0" + }, + "floating": { + "dependency": "direct main", + "description": { + "name": "floating", + "sha256": "ddcd7f28247746dbb62997c48c89d1824118676796df47fdc6f864f8d02849bc", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_cache_manager": { + "dependency": "transitive", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_html": { + "dependency": "direct main", + "description": { + "name": "flutter_html", + "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.0-beta.2" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_mailer": { + "dependency": "transitive", + "description": { + "name": "flutter_mailer", + "sha256": "4fffaa35e911ff5ec2e5a4ebbca62c372e99a154eb3bb2c0bf79f09adf6ecf4c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.2" + }, + "flutter_native_splash": { + "dependency": "direct dev", + "description": { + "name": "flutter_native_splash", + "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.1" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.22" + }, + "flutter_smart_dialog": { + "dependency": "direct main", + "description": { + "name": "flutter_smart_dialog", + "sha256": "6b5fd32cd2900745df30c1d95ef597ea0ee1ee8cfa557eab62010e3db1d3d717", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.9.8+1" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_volume_controller": { + "dependency": "direct main", + "description": { + "name": "flutter_volume_controller", + "sha256": "fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.2" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fluttertoast": { + "dependency": "transitive", + "description": { + "name": "fluttertoast", + "sha256": "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "8.2.8" + }, + "font_awesome_flutter": { + "dependency": "direct main", + "description": { + "name": "font_awesome_flutter", + "sha256": "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "10.7.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get": { + "dependency": "direct main", + "description": { + "name": "get", + "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.6.6" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gt3_flutter_plugin": { + "dependency": "direct main", + "description": { + "name": "gt3_flutter_plugin", + "sha256": "08f35692e937770ad6b3e2017eb8ef81839a82b8a63f5acf3abab14b688fc36c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.0" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http2": { + "dependency": "transitive", + "description": { + "name": "http2", + "sha256": "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.0" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.2.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "cf7243a0c29626284ada2add68a33f5b1102affe3509393e75136e0f6616bd68", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.6.8" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.0.0" + }, + "list_counter": { + "dependency": "transitive", + "description": { + "name": "list_counter", + "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.2" + }, + "loading_more_list": { + "dependency": "direct main", + "description": { + "name": "loading_more_list", + "sha256": "78e1090abe7a4fb0c0854a89017a05f436ee8ffc9f28f0b4c392cbc26087ddf7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.1.1" + }, + "loading_more_list_library": { + "dependency": "transitive", + "description": { + "name": "loading_more_list_library", + "sha256": "de6b57edbab83022180f053ec3f598dd5e1192cfd6a285882b8155e3cb5dc581", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.0" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "mailer": { + "dependency": "transitive", + "description": { + "name": "mailer", + "sha256": "3b27d204ff92a20aba227c25bc6467e245b0f19f9fbbc83aa357a9b7fa40267f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.1.2" + }, + "marquee": { + "dependency": "direct main", + "description": { + "name": "marquee", + "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.2.3" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.11.1" + }, + "material_design_icons_flutter": { + "dependency": "direct main", + "description": { + "name": "material_design_icons_flutter", + "sha256": "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "7.0.7296" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "name": "media_kit", + "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.11" + }, + "media_kit_libs_android_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.6" + }, + "media_kit_libs_ios_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_ios_video", + "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_macos_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_macos_video", + "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_video", + "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.5" + }, + "media_kit_libs_windows_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_windows_video", + "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.10" + }, + "media_kit_native_event_loop": { + "dependency": "transitive", + "description": { + "name": "media_kit_native_event_loop", + "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.9" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_video", + "sha256": "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.5" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct overridden", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "922e1f3d0b68291c42a2ec3a83542a886ea9b041", + "url": "https://github.com/orz12/mime.git" + }, + "source": "git", + "version": "1.0.5" + }, + "nil": { + "dependency": "direct main", + "description": { + "name": "nil", + "sha256": "ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.1" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.5.0" + }, + "ns_danmaku": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "dbc28547963dfb6c67fea968459f08d81bb1733c", + "url": "https://github.com/orz12/flutter_ns_danmaku.git" + }, + "source": "git", + "version": "0.0.5" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "8.0.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.2.10" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "12.0.12" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.3+2" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.2.2" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.5.1" + }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.0" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.0" + }, + "pull_to_refresh_notification": { + "dependency": "direct main", + "description": { + "name": "pull_to_refresh_notification", + "sha256": "5a06c242a6c3264bac3a7facbe2c6d317a5f54fc10c20b556dbd34ceee32c9aa", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.0" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_flutter": { + "dependency": "direct main", + "description": { + "name": "qr_flutter", + "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.1.0" + }, + "rxdart": { + "dependency": "direct overridden", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.2" + }, + "saver_gallery": { + "dependency": "direct main", + "description": { + "name": "saver_gallery", + "sha256": "5f4123ec1cd5ed9fcd93198ab30ffe0c7746afcbf6846445432de93240fa7b4e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.6" + }, + "screen_brightness": { + "dependency": "direct main", + "description": { + "name": "screen_brightness", + "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0+2" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0+1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.3" + }, + "scrollable_positioned_list": { + "dependency": "direct main", + "description": { + "name": "scrollable_positioned_list", + "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.3.8" + }, + "sentry": { + "dependency": "transitive", + "description": { + "name": "sentry", + "sha256": "1af8308298977259430d118ab25be8e1dda626cdefa1e6ce869073d530d39271", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "8.8.0" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "10.0.2" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "5.0.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.5.4+2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.11.1" + }, + "status_bar_control": { + "dependency": "direct main", + "description": { + "name": "status_bar_control", + "sha256": "7f2c1f3f7fd13b85ed284eb7ca3f74ceb8dcfdd25636d3a84186d0a687d36693", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.2.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.2.0" + }, + "system_proxy": { + "dependency": "direct main", + "description": { + "name": "system_proxy", + "sha256": "bbdfc9736a963409941fb0e7c494606c1f13c2be34de15833ee385da83cf7ab0", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.2.2" + }, + "universal_platform": { + "dependency": "direct main", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.3.10" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.5.0" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.1.4" + }, + "visibility_detector": { + "dependency": "transitive", + "description": { + "name": "visibility_detector", + "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.4.0+2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "14.2.5" + }, + "volume_controller": { + "dependency": "transitive", + "description": { + "name": "volume_controller", + "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.8" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.0" + }, + "waterfall_flow": { + "dependency": "direct main", + "description": { + "name": "waterfall_flow", + "sha256": "11538b0d890458e55e6248b177732495d20893cfc7e85d7e8dbf4fdce61c9f10", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.3" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webview_cookie_manager": { + "dependency": "direct main", + "description": { + "name": "webview_cookie_manager", + "sha256": "425a9feac5cd2cb62a71da3dda5ac2eaf9ece5481ee8d79f3868dc5ba8223ad3", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.0.6" + }, + "webview_flutter": { + "dependency": "direct main", + "description": { + "name": "webview_flutter", + "sha256": "ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "4.9.0" + }, + "webview_flutter_android": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_android", + "sha256": "6e64fcb1c19d92024da8f33503aaeeda35825d77142c01d0ea2aa32edc79fdc8", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.16.7" + }, + "webview_flutter_platform_interface": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_platform_interface", + "sha256": "d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "2.10.0" + }, + "webview_flutter_wkwebview": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_wkwebview", + "sha256": "1942a12224ab31e9508cf00c0c6347b931b023b8a4f0811e5dec3b06f94f117d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.15.0" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "5.5.4" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.1.4" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" + } +} diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index bba3843f4f4c..083ebff2d2a3 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -1,29 +1,59 @@ -{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme -, gobject-introspection, librsvg }: +{ + lib, + meson, + ninja, + pkg-config, + gettext, + fetchFromGitHub, + python3, + wrapGAppsHook3, + gtk3, + glib, + desktop-file-utils, + appstream-glib, + adwaita-icon-theme, + gobject-introspection, + librsvg, +}: python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.7"; + version = "0.8"; format = "other"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "piper"; - rev = version; - sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; + owner = "libratbag"; + repo = "piper"; + rev = version; + hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; - nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook3 + desktop-file-utils + appstream-glib + gobject-introspection + ]; buildInputs = [ - gtk3 glib adwaita-icon-theme python3 librsvg + gtk3 + glib + adwaita-icon-theme + python3 + librsvg + ]; + propagatedBuildInputs = with python3.pkgs; [ + lxml + evdev + pygobject3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; mesonFlags = [ "-Druntime-dependency-checks=false" - "-Dtests=false" ]; postPatch = '' @@ -31,12 +61,12 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_install.sh data/generate-piper-gresource.xml.py ''; - meta = with lib; { + meta = { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; - homepage = "https://github.com/libratbag/piper"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + homepage = "https://github.com/libratbag/piper"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix new file mode 100644 index 000000000000..b6877859a793 --- /dev/null +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + glib, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "plasma-panel-spacer-extended"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "luisbocanegra"; + repo = "plasma-panel-spacer-extended"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; + + buildInputs = [ + kdePackages.kdeplasma-addons + kdePackages.plasma-desktop + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") ]; + + propagatedUserEnvPkgs = [ glib ]; + + dontWrapQtApps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Spacer with mouse gestures for the KDE Plasma Panel"; + homepage = "https://github.com/luisbocanegra/plasma-panel-spacer-extended"; + changelog = "https://github.com/luisbocanegra/plasma-panel-spacer-extended/blob/main/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index 7318880e6849..b089c211b751 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -117,9 +117,8 @@ stdenv.mkDerivation rec { ''; #--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates - postInstall = '' - substituteInPlace share/applications/Plasticity.desktop \ - --replace-fail 'Exec=Plasticity %U' "Exec=Plasticity --use-gl=egl %U" + preFixup = '' + gappsWrapperArgs+=(--add-flags "--use-gl=egl") ''; meta = with lib; { diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 964386dfbb4c..056a5fa2dbd0 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-b473V082jM8d0XRn4tPzVGLryFNHn5Cab3IkNWve49s="; + hash = "sha256-TEQDjtSMJFZAYCoYXHmJxpxadYyd5DTo7HUhjglLRG8="; }; - vendorHash = "sha256-QDGs0L29W4QQBeIH1Z23nI/FYdu95kLnOAIZEWPOMWw="; + vendorHash = "sha256-KRjMEH17cvSjtRP/qYeWRFUo6f6v1ZxEd+H3xvZ1udQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 15331dfcef9d..4285db9048c2 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -15,7 +15,7 @@ libayatana-appindicator, gtk3, webkitgtk_4_0, - libsoup, + libsoup_2_4, openssl, xdotool, }: @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 - libsoup + libsoup_2_4 libayatana-appindicator openssl webkitgtk_4_0 diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index c5c62a54499f..a35ffa3072dd 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -93,7 +93,7 @@ buildPythonApplication rec { VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 # Resolve `.NET location: Not found` errors for dotnet tests - export DOTNET_ROOT="${dotnet-sdk.unwrapped}/share/dotnet" + export DOTNET_ROOT="${dotnet-sdk}/share/dotnet" export HOME=$(mktemp -d) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index ddbbe8781a4e..fce02ede99c3 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -104,6 +104,7 @@ python.pkgs.buildPythonApplication rec { "redis" "requests" "sentry-sdk" + "ua-parser" ]; pythonRemoveDeps = [ diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index 25136ffeb359..6d1308c8c0ac 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "5.22.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-Z7zSL2eixoNqWpgzVbiDUG2ViSmJtho7lRmvZ10ft3I="; + hash = "sha256-mwGFuJLry2WvwLclRw+ulMVgp8tfZbhzrdgKjQ4D7LE="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-2o6ClY0zMctLR4nFmApiYnzXlrN1EqbHkAP/FEcXnEQ="; + hash = "sha256-fOg32w/fQkyn8HBMffUKob7XzOQLtsB642pDdEz/y2E="; }; patchPhase = '' diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock index ae850ced93c7..df8651a1334d 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -47,43 +47,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "autocfg" @@ -97,12 +97,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - [[package]] name = "bitflags" version = "1.3.2" @@ -125,16 +119,19 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.16.0" +name = "castaway" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] [[package]] name = "cc" -version = "1.1.28" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -147,9 +144,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -157,9 +154,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -181,15 +178,29 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "static_assertions", +] [[package]] name = "core-foundation" @@ -209,9 +220,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -240,6 +251,31 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -252,37 +288,49 @@ dependencies = [ [[package]] name = "cursive" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e" dependencies = [ "ahash", "cfg-if", "crossbeam-channel", + "crossterm", "cursive_core", "lazy_static", "libc", "log", "signal-hook", - "termion", "unicode-segmentation", "unicode-width", ] [[package]] -name = "cursive_core" -version = "0.3.7" +name = "cursive-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "cursive_core" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257" dependencies = [ "ahash", + "compact_str", "crossbeam-channel", + "cursive-macros", "enum-map", "enumset", "lazy_static", "log", "num", - "owning_ref", + "parking_lot", + "serde_json", "time", "unicode-segmentation", "unicode-width", @@ -342,6 +390,17 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "enum-map" version = "2.7.3" @@ -401,15 +460,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -474,9 +533,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -484,12 +543,136 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -498,12 +681,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -524,18 +718,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "lazy_static" @@ -545,9 +730,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "linux-raw-sys" @@ -555,6 +740,22 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -585,6 +786,19 @@ dependencies = [ "adler2", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "native-tls" version = "0.2.12" @@ -691,12 +905,6 @@ dependencies = [ "libc", ] -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - [[package]] name = "once_cell" version = "1.20.2" @@ -705,9 +913,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -737,9 +945,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -748,12 +956,26 @@ dependencies = [ ] [[package]] -name = "owning_ref" -version = "0.4.1" +name = "parking_lot" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ - "stable_deref_trait", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", ] [[package]] @@ -782,22 +1004,23 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-auto-install-assistant" -version = "8.2.6" +version = "8.3.3" dependencies = [ "anyhow", "clap", "glob", "log", "proxmox-auto-installer", + "proxmox-installer-common", "regex", "serde", "serde_json", @@ -813,7 +1036,6 @@ dependencies = [ "glob", "log", "proxmox-installer-common", - "regex", "serde", "serde_json", "serde_plain", @@ -837,22 +1059,38 @@ name = "proxmox-fetch-answer" version = "0.1.0" dependencies = [ "anyhow", - "hex", "log", - "native-tls", "proxmox-auto-installer", - "rustls 0.20.9", - "rustls-native-certs 0.6.3", - "sha2", + "proxmox-installer-common", + "serde", + "serde_json", "toml", - "ureq", ] [[package]] name = "proxmox-installer-common" version = "0.1.0" dependencies = [ + "anyhow", + "hex", + "native-tls", "regex", + "rustls", + "rustls-native-certs", + "serde", + "serde_json", + "serde_plain", + "sha2", + "ureq", +] + +[[package]] +name = "proxmox-post-hook" +version = "0.1.0" +dependencies = [ + "anyhow", + "proxmox-auto-installer", + "proxmox-installer-common", "serde", "serde_json", ] @@ -879,24 +1117,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] -[[package]] -name = "redox_termios" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" - [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -906,9 +1138,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -921,21 +1153,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -946,16 +1163,16 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -966,29 +1183,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" -dependencies = [ - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", + "ring", "rustls-webpki", - "subtle", - "zeroize", + "sct", ] [[package]] @@ -998,20 +1200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", + "rustls-pemfile", "schannel", "security-framework", ] @@ -1022,35 +1211,25 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.7", + "base64", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" - [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", + "ring", + "untrusted", ] +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + [[package]] name = "ryu" version = "1.0.18" @@ -1059,21 +1238,27 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "sct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -1091,9 +1276,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -1101,18 +1286,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -1121,9 +1306,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -1176,6 +1361,17 @@ dependencies = [ "signal-hook-registry", ] +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -1186,10 +1382,10 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" +name = "smallvec" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spin" @@ -1203,23 +1399,23 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -1227,10 +1423,21 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.13.0" +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -1239,18 +1446,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "termion" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" -dependencies = [ - "libc", - "numtoa", - "redox_syscall", - "redox_termios", -] - [[package]] name = "time" version = "0.3.36" @@ -1285,25 +1480,20 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" -version = "0.7.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -1322,9 +1512,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -1339,26 +1529,11 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" @@ -1372,12 +1547,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -1386,33 +1555,45 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.22.1", + "base64", "flate2", "log", "native-tls", "once_cell", - "rustls 0.23.14", - "rustls-native-certs 0.7.3", - "rustls-pki-types", + "rustls", + "rustls-native-certs", + "rustls-webpki", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1437,89 +1618,11 @@ 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.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -1627,19 +1730,55 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "xi-unicode" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -1661,7 +1800,44 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.8.1" +name = "zerofrom" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index d161ab4ab0f3..acc15ff2c81f 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -3,17 +3,19 @@ fetchgit, rustPlatform, testers, - proxmox-auto-install-assistant, + pkg-config, + openssl, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "proxmox-auto-install-assistant"; - version = "8.2.6"; + version = "8.3.3"; src = fetchgit { url = "git://git.proxmox.com/git/pve-installer.git"; - rev = "c339618cbdcbce378bf192e01393a60903fe2b04"; - hash = "sha256-nF2FpzXeoPIB+dW92HAI+EJZuMJxlnD012Yu3hL9OvU="; + rev = "cf6df4a23491071d207dcc8b00af8ddf310ae0b0"; + hash = "sha256-n4mn8VF84QyJiUNubgoxkbMEbuyj8n5KeIdVB3Xz5iY="; }; postPatch = '' @@ -28,7 +30,17 @@ rustPlatform.buildRustPackage rec { cargoLock.lockFile = ./Cargo.lock; - passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl.dev ]; + + postFixup = '' + # openssl is not actually necessary, only pulled in through a feature (unfortunately) + patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; meta = { description = "Tool to prepare a Proxmox installation ISO for automated installations"; diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index 3599bcb09611..0ed60854d6e0 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pulsarctl"; - version = "2.11.1.3"; + version = "4.0.0.4"; src = fetchFromGitHub { owner = "streamnative"; repo = "pulsarctl"; rev = "v${version}"; - hash = "sha256-sztjHw3su8KAV/zZcJqPWhjblINa8nYCN5Dzhn6X07w="; + hash = "sha256-3uRDfoxj+ra6fEOE317ENKEuv5q+qHcEm6rw2GODK5g="; }; - vendorHash = "sha256-NQ8zvrW6lBF1js+WI2PPvXhv4YRS2IBT6S4vDoE1BFc="; + vendorHash = "sha256-wNUTJn7Ar+GlePEhdr6xeolAiltJdAoIs5o5uDo8Ibs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index b2856cb7978e..87a937da7f1a 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.18.0"; # do NOT update to 3.x Windows releases + version = "1.20.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8="; + hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4="; }; strictDeps = true; diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index f6689e7794f1..25f512e6d72b 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.71"; + version = "0.0.73"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; - rev = "refs/tags/v${version}"; - hash = "sha256-CzmfDOEh+3kUIl8dWYcxXH+6o+6zea/8hzZ09FaT8sw="; + tag = "v${version}"; + hash = "sha256-rpF0xrk1PvgfJ0EOHWnCuSWfzLVzXErnKizbvFBP+pg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZX3ql8GkgDLWFc3M1zIAu4QOYtZ/ryd1rrctkHpYmiU="; + cargoHash = "sha256-pU230ghfHsJEcADoZH8/yP+fYDv21FPlwA0//SvHJWY="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 6c1e92a9419a..e4fbe4052e67 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; rev = "refs/tags/v${version}"; - hash = "sha256-sMDWL0lA5iJ2v2dhUIhMgSZ1vk7LjkNMYZGiJRpd3XY="; + hash = "sha256-OFONjJXKkfb6+bQx5fhsadjm9WG62FISznnWL9IEY7I="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index 3d9d733de46d..55790a81a51f 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "qtscrcpy"; - version = "2.2.1"; + version = "3.0.0"; src = (fetchFromGitHub { owner = "barry-ran"; repo = "QtScrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-PL/UvRNqvLaFuvSHbkJsaJ2nqRp5+ERM+rmlKVtbShk="; + hash = "sha256-RW+7aHcxFEO4H9SVKfAfuwY0IXwThxM29oVS5zhWbpY="; fetchSubmodules = true; }).overrideAttrs (_: { diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index fde6c41cc061..9266176a3243 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.87.2"; + version = "1.87.4"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-w4jrtrKCATUsFkMVsGee88pYiL1bahHaSy9emCh2GJE="; + hash = "sha256-tM8j9oFIn5gAskM7Fxu4xMRh3pRsmroDDLkGyaie9I0="; }; dontPatch = true; diff --git a/pkgs/by-name/re/remotebox/package.nix b/pkgs/by-name/re/remotebox/package.nix index 3e7c50690896..7aede37fe70c 100644 --- a/pkgs/by-name/re/remotebox/package.nix +++ b/pkgs/by-name/re/remotebox/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "remotebox"; - version = "2.7"; + version = "3.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0csf6gd7pqq4abia4z0zpzlq865ri1z0821kjy7p3iawqlfn75pb"; + sha256 = "sha256-oIWSli/pc+kqMkYqkeHr3fZshWUHx6ecqAZXf6fl2ik="; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 8426e804c075..95a18ec25f26 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20241004git4b8a8f170"; + version = "1.15.3+20241112git6e850cb52"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-/+fH5DHL/kg4IlJyOlCuOMsUocaBsA8GYvq5iP7Ip+4="; + hash = "sha256-GkmzPc0pPRglkuGzPU+rLUcwlhw8v4VgQnxnkzT/+cI="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/reposilite/plugins.nix b/pkgs/by-name/re/reposilite/plugins.nix new file mode 100644 index 000000000000..28ecae2264f4 --- /dev/null +++ b/pkgs/by-name/re/reposilite/plugins.nix @@ -0,0 +1,49 @@ +{ + generateSplicesForMkScope, + makeScopeWithSplicing', +}: +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope; + f = + self: + { + fetchPlugin = self.callPackage ( + { + lib, + fetchurl, + reposilite, + }: + lib.makeOverridable ( + { name, hash }: + let + inherit (reposilite) version; + + fancyName = lib.concatStrings [ + (lib.toUpper (builtins.substring 0 1 name)) + (builtins.substring 1 ((builtins.stringLength name) - 1) name) + ]; + in + fetchurl { + url = "https://maven.reposilite.com/releases/com/reposilite/plugin/${name}-plugin/${version}/${name}-plugin-${version}-all.jar"; + inherit version hash; + + meta = { + description = "${fancyName} plugin for Reposilite."; + homepage = "https://github.com/dzikoysk/reposilite"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ uku3lig ]; + inherit (reposilite.meta) platforms; + }; + } + ) + ) { }; + } + // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) { + checksum = "sha256-ocvjjcrZW8I7hMdWiUn36XEbx3TqNYi0okemo9zWelA="; + groovy = "sha256-2NSTaivUAUMnAPHNqTNHWGqA8AF8jU9CE2ab9VGIFLo="; + migration = "sha256-+BfbLEy2gc81HVCyI2JREIIYMirKwPV48shMBAMbWlU="; + prometheus = "sha256-aukYUIS6S37ut9h+gO/JLrBUX/6RND5BhLqsrArxSUo="; + swagger = "sha256-zD2ihVEfQeH3S1df3o2gF19kGIODW2yIRWCGbk4npJY="; + }; +} diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/by-name/ro/rosegarden/package.nix similarity index 60% rename from pkgs/applications/audio/rosegarden/default.nix rename to pkgs/by-name/ro/rosegarden/package.nix index 57a7ca82254a..9acf3eec527d 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/by-name/ro/rosegarden/package.nix @@ -1,54 +1,82 @@ -{ lib -, stdenv -, fetchurl -, cmake -, makedepend -, perl -, pkg-config -, qttools -, wrapQtAppsHook -, dssi -, fftwSinglePrec -, ladspaH -, ladspaPlugins -, libjack2 -, alsa-lib -, liblo -, libsamplerate -, libsndfile -, lirc -, lrdf -, qtbase +{ + lib, + stdenv, + fetchurl, + cmake, + makedepend, + perl, + pkg-config, + qt5, + alsa-lib, + dssi, + fftwSinglePrec, + flac, + glib, + ladspaH, + ladspaPlugins, + libjack2, + liblo, + libmpg123, + libopus, + libsamplerate, + libsndfile, + libsysprof-capture, + libvorbis, + lilv, + lv2, + lirc, + lrdf, + libogg, }: stdenv.mkDerivation rec { pname = "rosegarden"; - version = "22.12.1"; + version = "24.12"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; + url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.xz"; + sha256 = "sha256-fz9mE2sJrxS9mZjkreTWIE1Fiv0WlHiP1tyzqW6/Fcw="; }; postPhase = '' substituteInPlace src/CMakeLists.txt --replace svnheader svnversion ''; - nativeBuildInputs = [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + makedepend + perl + pkg-config + qt5.qttools + qt5.wrapQtAppsHook + ]; buildInputs = [ + alsa-lib dssi fftwSinglePrec + flac + glib ladspaH ladspaPlugins libjack2 liblo + libmpg123 + libogg + libopus libsamplerate libsndfile + libsysprof-capture + libvorbis + lilv + lv2 lirc lrdf - qtbase - alsa-lib + qt5.qtbase + ]; + + cmakeFlags = [ + "-DLILV_INCLUDE_DIR=${lilv.dev}/include/lilv-0" ]; meta = with lib; { diff --git a/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch b/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch new file mode 100644 index 000000000000..fa1ca26088ce --- /dev/null +++ b/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch @@ -0,0 +1,22 @@ +From 7d62095b94f8df3891c984a1535026d2658bb177 Mon Sep 17 00:00:00 2001 +From: Edmund Wu +Date: Sat, 11 Apr 2020 16:59:35 -0400 +Subject: [PATCH] meson: actually use systemd_systemunitdir + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02e6c73..ba5ba1e 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,7 +58,7 @@ if policydir == '' + policydir = get_option('datadir') / 'polkit-1' / 'actions' + endif + +-systemunitdir = '' ++systemunitdir = get_option('systemd_systemunitdir') + if systemunitdir == '' and systemd_dep.found() + systemunitdir = systemd_dep.get_pkgconfig_variable( + 'systemdsystemunitdir', diff --git a/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch b/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch new file mode 100644 index 000000000000..54992e84ca66 --- /dev/null +++ b/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch @@ -0,0 +1,22 @@ +From 98f70edd8f534c371cb4308b9720739c5178918d Mon Sep 17 00:00:00 2001 +From: Felipe Sateler +Date: Sat, 11 Apr 2020 10:59:21 -0400 +Subject: [PATCH] meson: fix librt find_library check + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02e6c73..49da472 100644 +--- a/meson.build ++++ b/meson.build +@@ -22,7 +22,7 @@ polkit_dep = dependency('polkit-gobject-1', required: false) + systemd_dep = dependency('systemd', required: false) + thread_dep = dependency('threads') + +-librt_dep = cc.find_library('z') ++librt_dep = cc.find_library('rt') + cc.check_header('sched.h', dependencies: librt_dep) + cc.has_function('sched_setscheduler', dependencies: librt_dep) + diff --git a/pkgs/by-name/rt/rtkit/package.nix b/pkgs/by-name/rt/rtkit/package.nix index 9c580edc308f..12dc6bbe392f 100644 --- a/pkgs/by-name/rt/rtkit/package.nix +++ b/pkgs/by-name/rt/rtkit/package.nix @@ -15,23 +15,9 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "meson-actual-use-systemd_systemunitdir.patch"; - url = "https://github.com/heftig/rtkit/pull/19/commits/7d62095b94f8df3891c984a1535026d2658bb177.patch"; - sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7"; - }) - - (fetchpatch { - name = "meson-fix-librt-find_library-check.patch"; - url = "https://github.com/heftig/rtkit/pull/18/commits/98f70edd8f534c371cb4308b9720739c5178918d.patch"; - sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl"; - }) - - (fetchpatch { - name = "rtkit-daemon-dont-log-debug-messages-by-default.patch"; - url = "https://github.com/heftig/rtkit/pull/33/commits/ad649ee491ed1a41537774ad11564a208e598a09.patch"; - sha256 = "sha256-p+MdJVMv58rFd1uc1UFKtq83RquDSFZ3M6YfaBU12UU="; - }) + ./meson-actual-use-systemd_systemunitdir.patch + ./meson-fix-librt-find_library-check.patch + ./rtkit-daemon-dont-log-debug-messages-by-default.patch ]; nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ]; diff --git a/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch b/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch new file mode 100644 index 000000000000..667d80ab6915 --- /dev/null +++ b/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch @@ -0,0 +1,73 @@ +From 4880b9c67628a781bdb183dcdc69f12cb829817d Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Sat, 15 Apr 2023 11:53:27 +0200 +Subject: [PATCH] rtkit-daemon: Don't log debug messages by default + +The rtkit-daemon service is a lot more verbose than other services +when it doesn't have anything to do. Stop logging the debug messages +by default to avoid flooding the system log. + +This addresses issue #22. +--- + rtkit-daemon.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/rtkit-daemon.c b/rtkit-daemon.c +index 17122fa..0c5d814 100644 +--- a/rtkit-daemon.c ++++ b/rtkit-daemon.c +@@ -154,6 +154,9 @@ static bool canary_demote_unknown = FALSE; + /* Log to stderr? */ + static bool log_stderr = FALSE; + ++/* Also log debugging messages? */ ++static bool log_debug = FALSE; ++ + /* Scheduling policy to use */ + static int sched_policy = SCHED_RR; + +@@ -1876,6 +1879,7 @@ enum { + ARG_CANARY_DEMOTE_UNKNOWN, + ARG_CANARY_REFUSE_SEC, + ARG_STDERR, ++ ARG_DEBUG, + ARG_INTROSPECT + }; + +@@ -1905,6 +1909,7 @@ static const struct option long_options[] = { + { "canary-demote-unknown", no_argument, 0, ARG_CANARY_DEMOTE_UNKNOWN }, + { "canary-refuse-sec", required_argument, 0, ARG_CANARY_REFUSE_SEC }, + { "stderr", no_argument, 0, ARG_STDERR }, ++ { "debug", no_argument, 0, ARG_DEBUG }, + { "introspect", no_argument, 0, ARG_INTROSPECT }, + { NULL, 0, 0, 0} + }; +@@ -1933,6 +1938,7 @@ static void show_help(const char *exe) { + " --version Show version\n\n" + "OPTIONS:\n" + " --stderr Log to STDERR in addition to syslog\n" ++ " --debug Also log debugging mssages\n" + " --user-name=USER Run daemon as user (%s)\n\n" + " --scheduling-policy=(RR|FIFO) Choose scheduling policy (%s)\n" + " --our-realtime-priority=[%i..%i] Realtime priority for the daemon (%u)\n" +@@ -2222,6 +2228,10 @@ static int parse_command_line(int argc, char *argv[], int *ret) { + log_stderr = TRUE; + break; + ++ case ARG_DEBUG: ++ log_debug = TRUE; ++ break; ++ + case ARG_INTROSPECT: + fputs(introspect_xml, stdout); + *ret = 0; +@@ -2251,6 +2261,9 @@ static int parse_command_line(int argc, char *argv[], int *ret) { + return -1; + } + ++ if (!log_debug) ++ setlogmask(LOG_UPTO(LOG_INFO)); ++ + assert(our_realtime_priority >= (unsigned) sched_get_priority_min(sched_policy)); + assert(our_realtime_priority <= (unsigned) sched_get_priority_max(sched_policy)); + diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 94da18d76891..3b58082dd422 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -14,31 +14,22 @@ ncurses, openssl, pkg-config, - xmlrpc_c, zlib, nixosTests, - gitUpdater, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.10.0"; + version = "0.10.0-unstable-2024-12-06"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${version}"; - hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; + rev = "5a200f5d8f8bc8ed28dfc948321451585f724b15"; + hash = "sha256-RLFOHJLpt7xkrEvYwEBWs5wQRThrK1N2olI64p2TPeA="; }; - patches = [ - # fix: use fsync for osx builds - (fetchpatch { - url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch"; - hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw="; - }) - ]; - outputs = [ "out" "man" @@ -63,17 +54,16 @@ stdenv.mkDerivation rec { libtorrent ncurses openssl - xmlrpc_c zlib ]; configureFlags = [ - "--with-xmlrpc-c" + "--with-xmlrpc-tinyxml2" "--with-posix-fallocate" ]; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index 2f90692003fc..ecb63fe7a9ce 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -33,6 +33,7 @@ tinysparql, shared-mime-info, gnome, + rygel, }: stdenv.mkDerivation (finalAttrs: { @@ -78,9 +79,11 @@ stdenv.mkDerivation (finalAttrs: { gupnp-dlna libgee libsoup_3 - gtk3 libmediaart pipewire + # Move this to withGtk when it's not unconditionally included + # https://gitlab.gnome.org/GNOME/rygel/-/issues/221 + # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27 libX11 sqlite systemd @@ -116,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { packageName = "rygel"; versionPolicy = "odd-unstable"; }; + noGtk = rygel.override { withGtk = false; }; }; meta = with lib; { diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index 077c4bfef8ca..6411512c8a69 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -1,40 +1,40 @@ -{ lib -, python3 -, fetchFromGitea -, gobject-introspection -, gtk3 -, libhandy -, modemmanager -, wrapGAppsHook3 +{ + lib, + python3, + fetchFromGitea, + gobject-introspection, + libadwaita, + modemmanager, + wrapGAppsHook4, }: python3.pkgs.buildPythonApplication rec { pname = "satellite"; - version = "0.5.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitea { - domain ="codeberg.org"; + domain = "codeberg.org"; owner = "tpikonen"; repo = "satellite"; - rev = version; - hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90="; + tag = version; + hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE="; }; nativeBuildInputs = [ gobject-introspection - python3.pkgs.setuptools - wrapGAppsHook3 + wrapGAppsHook4 ]; + build-system = with python3.pkgs; [ setuptools ]; + buildInputs = [ - gtk3 - libhandy + libadwaita modemmanager ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ gpxpy pygobject3 pynmea2 @@ -42,16 +42,16 @@ python3.pkgs.buildPythonApplication rec { strictDeps = true; - meta = with lib; { + meta = { description = "Program for showing navigation satellite data"; longDescription = '' Satellite is an adaptive GTK3 / libhandy application which displays global navigation satellite system (GNSS: GPS et al.) data obtained from ModemManager or gnss-share. It can also save your position to a GPX-file. ''; homepage = "https://codeberg.org/tpikonen/satellite"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "satellite"; - platforms = platforms.linux; - maintainers = with maintainers; [ Luflosi ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Luflosi ]; }; } diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix index 70d54d077445..7b01bc859c06 100644 --- a/pkgs/by-name/sc/schemacrawler/package.nix +++ b/pkgs/by-name/sc/schemacrawler/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.22.2"; + version = "16.22.3"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA="; + hash = "sha256-bZXJvINVsDkGU+xR1tukK2qY93MAVIp2yGV5TZQoQsY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index d02b5a903286..afe4147f1930 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "3.0"; + version = "3.0.2"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-gABExiqU1fwW9auchtRbEFDq4+tDZRTRsNL+Jka4lOo="; + hash = "sha256-4Z/gJL+jNngJSUQHrWyoCab2532slemfhbp1FE4Lo10="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-fKfiBx3uQH30ZLCWRY33KyisjxLDvWJCdKbGn4j0dWw="; + hash = "sha256-6CViFgQuazvKGPHGpityEI/mpgOmIBA6LTEHobWybV0="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index 3a3b687459c8..a8577be31592 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-76P4njY/Wb9l4LG+sZwiwQVrvfXCtAELju30GLi7kBE="; + hash = "sha256-wkdc6nVJgpl1zizw3WJ3y3N4KzEW6WXSt5G/kOF2su8="; }; - vendorHash = "sha256-gBb+qpNFSFhCOYLxXkz3xmyx+3PvyOwLNqjT9zZQuc8="; + vendorHash = "sha256-VConM8zvpTTIQ5FIzI7yqDdhN0UPIAoDiudqU4k+5Vo="; ldflags = [ "-s" diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix index b5d6c4474e53..92ca7ad326f6 100644 --- a/pkgs/by-name/sh/shellhub-agent/package.nix +++ b/pkgs/by-name/sh/shellhub-agent/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.16.4"; + version = "0.17.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-pxV9WLx0trgG0htWuYG/j634iaQRo5/TXOOU8rOmxDw="; + hash = "sha256-zMAAimFrOMcBVKuFwl/UpJLEWJHrjH7DNno5KCEvGrM="; }; modRoot = "./agent"; - vendorHash = "sha256-qqh9KdhOt6KDgwUhf6lzb6I7YAhocBSZ7UeyBT0e0eM="; + vendorHash = "sha256-jQNWuOwaAx//wDUVOrMc+ETWWbTCTp/SLwL2guERJB8="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 8638555e2192..9552f9e258fa 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.34.0"; + version = "7.35.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-UfyD2R78SkvAn7PppOfAK/zzPPpRVdI3y2T/F07ad1E="; + hash = "sha256-+ZzZp3/koitwtHyUmcgltcYo91KfDfQzOjnOzTJJu6c="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index bb6a2193eccf..2b91d4166037 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.34.0"; + version = "7.35.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8="; + hash = "sha256-cQ7bwgRjlI2idnHtl7EZyBfjcPz52s8+E7UpLxn4FEg="; } diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 8541b9fd668a..ab9d02099628 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20241119"; + version = "20241205"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-HZNjkOuJOoOSPmJHu6QTYzyxgS4dSC6lWB++xF4rRnI="; + hash = "sha256-e6T40FMM24wsVOZDE8lFeE5WKjpAFoG0M05E8oHiZeo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index dd3c31e2ac92..8fb9f4e89e0b 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - # so the cargo fetcher won't try to run the `./configure` script - dontConfigure = true; hash = "sha256-iPkXEUC4U1m/ComIDo/J5kwkmM1QdowioNtnSnmMhJ0="; }; @@ -169,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + broken = stdenv.isDarwin; description = "Typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 29468c2f669f..caf3f333e812 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }: +{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup_3, webkitgtk_4_1 }: rustPlatform.buildRustPackage { pname = "snx-rs"; version = "2.2.3"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl glib atk gtk3 libsoup webkitgtk_4_1 ]; + buildInputs = [ openssl glib atk gtk3 libsoup_3 webkitgtk_4_1 ]; checkFlags = [ "--skip=platform::linux::net::tests::test_default_ip" diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix index 54bbacc847ff..e69f64c1f29a 100644 --- a/pkgs/by-name/so/sonivox/package.nix +++ b/pkgs/by-name/so/sonivox/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sonivox"; - version = "3.6.13"; + version = "3.6.14"; src = fetchFromGitHub { owner = "pedrolcl"; repo = pname; rev = "v${version}"; - hash = "sha256-QhXMmJbyqDxSJmT847Qbg1jbU3gLFsJ/FWVTy7MV2fE="; + hash = "sha256-4IlxXa9D65tGu8W5TXF9qoM/IEP9im0vbdde2SnZyX4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 05fa66c2d7a2..65d84c62740c 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -1,23 +1,28 @@ { lib, - buildGoModule, + buildGo122Module, fetchFromGitHub, installShellFiles, nix-update-script, }: -buildGoModule rec { +buildGo122Module rec { pname = "sops"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "getsops"; repo = pname; - rev = "v${version}"; - hash = "sha256-j16hSTi7fwlMu8hwHqCR0lW22VSf0swIVTF81iUYl2k="; + rev = "refs/tags/v${version}"; + hash = "sha256-v35LRFYdnWigWYlDhrOgSOcCI7SUqJbJHaZvlQ6PC4I="; }; - vendorHash = "sha256-40YESkLSKL/zFBI7ccz0ilrl9ATr74YpvRNrOpzJDew="; + vendorHash = "sha256-dnhrZPXZWeU98+dEaFLIdtcLWgIrh47l+WAxe+F+0/I="; + + postPatch = '' + substituteInPlace go.mod \ + --replace-fail "go 1.22" "go 1.22.7" + ''; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index db17baa6534b..fb1e74801f9c 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -10,7 +10,7 @@ gdk-pixbuf, glib, gst_all_1, - libsoup, + libsoup_3, webkitgtk_4_1, xdotool, }: @@ -106,7 +106,7 @@ else buildInputs = [ xdotool glib - libsoup + libsoup_3 webkitgtk_4_1 gdk-pixbuf gst_all_1.gst-plugins-ugly diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index f8a7f3a7c268..ca99f88fa57b 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -14,7 +14,7 @@ , libevdev , libgee , libgudev -, libsoup +, libsoup_2_4 , pantheon }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libevdev libgee libgudev - libsoup + libsoup_2_4 pantheon.granite ]; diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index 4ed964773063..d0ea01ba160f 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -2,7 +2,7 @@ dbus, openssl, freetype, - libsoup, + libsoup_2_4, gtk3, webkitgtk_4_0, pkg-config, @@ -66,7 +66,7 @@ in ''; nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; - buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0]; + buildInputs = [dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0]; # Disable checkPhase, since the project doesn't contain tests doCheck = false; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 355ca94f8334..b1ad82dc2b7d 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-FmhfsfRq6pxDhGDsNqY2IQczHk8NYEdxNaN2hfbhDYw="; + hash = "sha256-SFiGRmi8Bd0WEitvDvybfGMEw36gAVjtLrYbBpBAItU="; }; - vendorHash = "sha256-ZziypdQJaQHdL5/bcX6P5VHGVtbcl+twtlOg7DlmLZM="; + vendorHash = "sha256-t42TAjRuMo1AXq3IKbN2L7G50vJzi/2LmhPKrn5K1Io="; ldflags = [ "-w" diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 21a447adc821..1d0cb0510606 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "2.0.0"; + version = "2.1"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-WjhNWwAeb6f7tlvXMr6Q7mtNnaWbHSnBtXK6Ba3YOW4="; + hash = "sha256-ER+TpODf+Inqo+XWJRNOHumzGRL4Dms5N1E+BU7Tr94="; }; installPhase = '' diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix index a8074cef4074..fa4074b8a524 100644 --- a/pkgs/by-name/ta/tagger/package.nix +++ b/pkgs/by-name/ta/tagger/package.nix @@ -31,11 +31,11 @@ buildDotnetModule rec { nativeBuildInputs = [ blueprint-compiler - libadwaita ]; buildInputs = [ chromaprint + libadwaita ]; runtimeDeps = [ diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 9552afd1a635..2b39d517560a 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -6,7 +6,7 @@ , libgee , libhandy , libsecret -, libsoup +, libsoup_2_4 , meson , ninja , nix-update-script @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgee libhandy libsecret - libsoup + libsoup_2_4 pantheon.granite ]; diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index b50b747eb35e..66a70a9c7636 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.39"; + version = "1.8.41"; src = fetchFromGitHub { owner = "tdlib"; @@ -30,8 +30,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "056963e48fa8d3f89556239c22d6ac843d3c8a5b"; - hash = "sha256-pQ+uYnyBTH4L6RW3MqAttx7K3z8fyEbzRy8JSjbBL98="; + rev = "5b974c298d4ed551d3ad2c061ad7b8280d137c7e"; + hash = "sha256-1TyGv2yMjX75+ccZSox/2m6SMmwEZAkShIhLfCeNmZg="; }; buildInputs = [ gperf openssl readline zlib ]; @@ -56,6 +56,6 @@ stdenv.mkDerivation { homepage = "https://core.telegram.org/tdlib/"; license = [ licenses.boost ]; platforms = platforms.unix; - maintainers = [ maintainers.vyorkin ]; + maintainers = [ maintainers.vyorkin maintainers.vonfry ]; }; } diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/by-name/te/tealdeer/package.nix similarity index 93% rename from pkgs/tools/misc/tealdeer/default.nix rename to pkgs/by-name/te/tealdeer/package.nix index 2de33cdd09b0..51d43799621e 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -3,7 +3,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, Security +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/telepathy-gabble/package.nix b/pkgs/by-name/te/telepathy-gabble/package.nix index dc4b11caf0b9..d2e2676af5ad 100644 --- a/pkgs/by-name/te/telepathy-gabble/package.nix +++ b/pkgs/by-name/te/telepathy-gabble/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus -, sqlite, libsoup, libnice, gnutls +, sqlite, libsoup_2_4, libnice, gnutls , fetchpatch }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config libxslt python3 ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup_2_4 libnice telepathy-glib gnutls ]; nativeCheckInputs = [ dbus ]; diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix index 1df89b323838..2328d03e1870 100644 --- a/pkgs/by-name/ti/time/package.nix +++ b/pkgs/by-name/ti/time/package.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+6zwyB5iQp3z4zvaTO44dWYE8Y4B2XczjiMwaj47Uh4="; }; + patches = [ + # fixes cross-compilation to riscv64-linux + ./time-1.9-implicit-func-decl-clang.patch + ]; + meta = { description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' diff --git a/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch new file mode 100644 index 000000000000..ca76b5a50050 --- /dev/null +++ b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch @@ -0,0 +1,24 @@ +https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html + +From c8deae54f92d636878097063b411af9fb5262ad3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 07:24:24 -0700 +Subject: [PATCH] include string.h for memset() + +Fixes implicit function declaration warning e.g. + +resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)' + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html] +Signed-off-by: Khem Raj +--- a/src/resuse.c ++++ b/src/resuse.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include + #include + #include + #include + diff --git a/pkgs/by-name/ti/timezonemap/package.nix b/pkgs/by-name/ti/timezonemap/package.nix index f2ceb056f25a..de7915b5f67b 100644 --- a/pkgs/by-name/ti/timezonemap/package.nix +++ b/pkgs/by-name/ti/timezonemap/package.nix @@ -9,7 +9,7 @@ , file , gobject-introspection , json-glib -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gtk3 glib json-glib - libsoup + libsoup_2_4 ]; configureFlags = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 5ff9d8a4a1ed..65bb411bf2c4 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.12.8"; + version = "0.12.10"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; - rev = "refs/tags/v${version}"; - hash = "sha256-yEvWPCFxdwc+fJOYRpxH1M5Fr+SedPm5fIE5tS1Fzhk="; + tag = "v${version}"; + hash = "sha256-y+H1Q8TJa7XinVcsgZ9XCyeIUqQzvIAjlkgjia9rNso="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k4X62J5SUDkg70acESbwlqQIF9mnQzNgA0pvHuxCwfs="; + cargoHash = "sha256-Fvd8PqT64HseoIIhsWittN6Trp2i4ravIc+ETwiY+xQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index 4341d4ac8325..83edbf65cfa5 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tomboy-ng"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "tomboy-notes"; repo = "tomboy-ng"; rev = "v${finalAttrs.version}"; - hash = "sha256-QRv0LVZpRxW9c/cCcDsMSAYQ3zuYa39VJbcys5N+1x0="; + hash = "sha256-W5pW2QwAFKhs8O5TqUbe2i+uMGDU1G4wZ+f+rfn9+ds="; }; kcontrols = fetchFromGitHub { owner = "davidbannon"; diff --git a/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch index d2b08ca2a080..9fce6305945a 100644 --- a/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch +++ b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch @@ -1,17 +1,17 @@ diff --git a/buildit.bash b/buildit.bash -index 6606562..57b9e14 100755 +index 47e861b..ce52387 100755 --- a/buildit.bash +++ b/buildit.bash -@@ -61,7 +61,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 " # cut down on compiler noise +@@ -63,7 +63,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 " # cut down on compiler noise # 6058 - note about things not being inlined # 5027 - var not used # 2005 - level 2 comment --FPCHARD=" -Cg -k-pie -k-znow " -+FPCHARD="" - AUTODOWNLOAD=FALSE # downloading large file, use -d to allow it +-FPCHARD=" -Cg -k-pie -k-znow " # might get cancelled with a NOHARDENING semaphore file. ++FPCHARD="" # might get cancelled with a NOHARDENING semaphore file. + AUTODOWNLOAD=FALSE # downloading large file, use -d to allow it # ------------------------ Some functions ------------------------ -@@ -180,8 +180,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches ! +@@ -196,8 +196,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches ! fi TARGET="$CPU-$OS" @@ -20,7 +20,7 @@ index 6606562..57b9e14 100755 CheckForQt5 # OK, if to here, we have a fpc and lazbuild, but which FPC ? -@@ -228,8 +226,8 @@ cd "$K_DIR" # WARNING, kcontrols is not part of the github zip file, its added +@@ -244,8 +242,8 @@ cd "$K_DIR" # WARNING, kcontrols is not part of the github zip file, its added # Here we build just the kmemo.pas part of kcontrols. @@ -31,7 +31,7 @@ index 6606562..57b9e14 100755 FPCKOPT=" -B -MObjFPC -Scgi -Cg -O1 -g -gl -l -vewnibq -vh- $EXCLUDEMESSAGES -Fi$K_DIR" FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$TARGET -Fu$LAZ_DIR/components/lazutils/lib/$TARGET" -@@ -237,7 +235,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR +@@ -253,7 +251,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET" FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET -Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET" FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET -Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET" @@ -40,7 +40,7 @@ index 6606562..57b9e14 100755 RUNIT="$COMPILER $EXCLUDEMESSAGE $FPCKOPT $FPCHARD $LAZUNITSRC $FPCKUNITS kmemo.pas" -@@ -245,12 +243,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------" +@@ -261,12 +259,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------" echo "$RUNIT" echo "-----------------" @@ -55,7 +55,7 @@ index 6606562..57b9e14 100755 echo "ERROR failed to build KControls, exiting..." K_DIR="" exit 1 -@@ -301,7 +299,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET" +@@ -318,7 +316,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET" UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$TARGET" UNITS="$UNITS -Fu$SOURCE_DIR/" @@ -64,7 +64,7 @@ index 6606562..57b9e14 100755 OPT2=" -dLCL -dLCL$WIDGET" DEFS="-dDisableLCLGIF -dDisableLCLJPEG -dDisableLCLPNM -dDisableLCLTIFF" -@@ -322,11 +320,10 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr" +@@ -339,7 +337,7 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr" echo "------------ tomboy-ng COMPILE COMMAND --------------------" echo "$RUNIT" @@ -72,8 +72,4 @@ index 6606562..57b9e14 100755 +TOMBOY_NG_VER="$VERSION" $RUNIT if [ ! -e "$PROJ" ]; then - echo "======================== ERROR, COMPILE FAILED source/tomboy-ng.log =====" -- cat tomboy-ng.log - echo "=========================================================== END of LOG ==" - exit 1 - else + echo "======== ERROR, COMPILE FAILED see source/tomboy-ng.log =====" diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index bd355787d487..64b086fd1733 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -7,7 +7,7 @@ , freetype , gsettings-desktop-schemas , gtk3 -, libsoup +, libsoup_2_4 , stdenv , yarnConfigHook , yarnBuildHook @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage { dbus openssl freetype - libsoup + libsoup_2_4 gtk3 webkitgtk_4_0 gsettings-desktop-schemas diff --git a/pkgs/by-name/tr/trueseeing/package.nix b/pkgs/by-name/tr/trueseeing/package.nix index 2a5001a41a51..7cfff66aa91d 100644 --- a/pkgs/by-name/tr/trueseeing/package.nix +++ b/pkgs/by-name/tr/trueseeing/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.2.4"; + version = "2.2.5"; pyproject = true; src = fetchFromGitHub { owner = "alterakey"; repo = "trueseeing"; - rev = "refs/tags/v${version}"; - hash = "sha256-2KELqHa6lw9wdJBaC90vTZSjD7tfkr3K6yDNhqBQrR0="; + tag = "v${version}"; + hash = "sha256-EDnE1BK/nl3nqkan4gmSsP7vqkuMNJ5+oN09ZnQzsy0="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix index b95bc53e2bea..c6bee9ae3369 100644 --- a/pkgs/by-name/tt/ttags/package.nix +++ b/pkgs/by-name/tt/ttags/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.4.1"; +let version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "ttags"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "npezza93"; repo = "ttags"; rev = "${version}"; - hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; + hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA="; }; - cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; + cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg="; passthru.tests.version = testers.testVersion { package = ttags; diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index 8637340f3826..e4834143db8c 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -9,7 +9,7 @@ , itstool , wrapGAppsHook3 , desktop-file-utils -, libsoup +, libsoup_2_4 , json-glib , geoclue2 , geocode-glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 json-glib geoclue2 geocode-glib diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix new file mode 100644 index 000000000000..72fcf0936ecb --- /dev/null +++ b/pkgs/by-name/tu/turnon/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cairo, + pango, + pkg-config, + libadwaita, + blueprint-compiler, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "turnon"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "swsnr"; + repo = "turnon"; + rev = "v${version}"; + hash = "sha256-727v1jQBBueLHvk0DphMHnrgJe46gap3hp0ygUYezJ0="; + }; + + cargoHash = "sha256-mywGCIjsoShRPRNMkTmVh7597QdvBSIsI/HucYv3CzY="; + + nativeBuildInputs = [ + cairo + pango + pkg-config + blueprint-compiler + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + ]; + + strictDeps = true; + + preBuild = '' + blueprint-compiler format resources/**/*.blp + ''; + + meta = { + description = "Turn on devices in your local network"; + homepage = "https://github.com/swsnr/turnon"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ mksafavi ]; + mainProgram = "turnon"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index 43c655750db5..e15ba4bf023f 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -16,6 +16,7 @@ , expat , alsa-lib , buildFHSEnv +, writeTextFile }: let @@ -60,6 +61,7 @@ let pango cairo mesa + libGL expat libxkbcommon ]) ++ (with pkgs.xorg; [ @@ -73,10 +75,35 @@ let libxcb ]); runScript = '' - Typora $* + Typora "$@" ''; }; + launchScript = writeTextFile { + name = "typora-launcher"; + executable = true; + text = '' + #!${stdenv.shell} + + # Configuration directory setup + XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-~/.config} + TYPORA_CONFIG_DIR="$XDG_CONFIG_HOME/Typora" + TYPORA_DICT_DIR="$TYPORA_CONFIG_DIR/typora-dictionaries" + + # Create config directories with proper permissions + mkdir -p "$TYPORA_DICT_DIR" + chmod 755 "$TYPORA_CONFIG_DIR" + chmod 755 "$TYPORA_DICT_DIR" + + # Read user flags if they exist + if [ -f "$XDG_CONFIG_HOME/typora-flags.conf" ]; then + TYPORA_USER_FLAGS="$(sed 's/#.*//' "$XDG_CONFIG_HOME/typora-flags.conf" | tr '\n' ' ')" + fi + + exec ${typoraFHS}/bin/typora-fhs "$@" $TYPORA_USER_FLAGS + ''; + }; + in stdenv.mkDerivation { inherit pname version; @@ -87,7 +114,7 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir -p $out/bin - ln -s ${typoraFHS}/bin/typora-fhs $out/bin/typora + ln -s ${launchScript} $out/bin/typora ln -s ${typoraBase}/share/ $out runHook postInstall ''; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 546fc7f84688..0e0becafc9f2 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; - rev = "refs/tags/v${version}"; - hash = "sha256-sezpyp5Nev9i1pxCbFSQcm551VEHPmuP1ouCusNt7h8="; + tag = "v${version}"; + hash = "sha256-JGRFZBPWG2pFur7K9JvQub5Fx4HvdyR+0hQFLI1tpo4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sm9U+Y21+m8Tmj5rhJ18iRSp1DACAisRUzNQpA+EG6g="; + cargoHash = "sha256-YmG2UO9dkdrEULVieSdzd+NgqFaYOHojnrjHUi2ME8Q="; # Disabling tests requiring network access checkFlags = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md"; description = "Format your typst source code"; homepage = "https://github.com/Enter-tainer/typstyle"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix index 710979057d43..6fcee7fb8d53 100644 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ b/pkgs/by-name/uh/uhttpmock/package.nix @@ -10,7 +10,7 @@ , gtk-doc , docbook-xsl-nons , glib -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/um/umr/package.nix b/pkgs/by-name/um/umr/package.nix index aa9b63c3d0d7..8325fe4f3654 100644 --- a/pkgs/by-name/um/umr/package.nix +++ b/pkgs/by-name/um/umr/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "umr"; - version = "1.0.8"; + version = "1.0.10"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "tomstdenis"; repo = "umr"; rev = version; - hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; + hash = "sha256-i0pTcg1Y+G/nGZSbMtlg37z12gF4heitEl5L4gfVO9c="; }; nativeBuildInputs = [ @@ -47,11 +47,6 @@ stdenv.mkDerivation rec { bash-completion # Tries to create bash-completions in /var/empty otherwise? ]; - # Remove static libraries (there are no dynamic libraries in there) - postInstall = '' - rm -r $out/lib - ''; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index b5edc7eb2311..745cdd1003a8 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "7.1.1"; + version = "7.1.2"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-dGF5xCZRHnaMVj/OGIIFbytN7Jnj39gq7ym6hq/EZsk="; + hash = "sha256-6xqAik10YSXh2pm/j0dSeQXDWAGVnOf6eOD7Od9+LZA="; }; sourceRoot = finalAttrs.src.name; diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index dd6dcb2c70ad..41e495d38229 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -486,7 +486,7 @@ def _update_package(path, target): if fetcher == "fetchFromGitHub": # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = r"(rev\s+=\s+[^;]*;)" + regex = r"((?:rev|tag)\s+=\s+[^;]*;)" regex = re.compile(regex) matches = regex.findall(text) n = len(matches) @@ -496,7 +496,7 @@ def _update_package(path, target): else: # forcefully rewrite rev, incase tagging conventions changed for a release match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') + text = text.replace(match, f'tag = "{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', "version;") diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index ce8d48ce0016..7a8eaa761507 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-M4R0uSAX0MUTUCsPtdRMPESFET9AEQBtjvM7eTcRCas="; + hash = "sha256-LKSKbUx7rxNWBybEKA7ah/5esArs9TRFJexLlMlEqjs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix index d69322bc17c7..bb44c6feeb73 100644 --- a/pkgs/by-name/va/vagrant/gemset.nix +++ b/pkgs/by-name/va/vagrant/gemset.nix @@ -1,33 +1,43 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; childprocess = { groups = ["default"]; @@ -44,20 +54,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.4"; + version = "3.4.1"; }; diff-lcs = { groups = ["default" "development"]; @@ -84,20 +94,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.109.0"; + version = "1.2.2"; }; fake_ftp = { groups = ["development"]; @@ -109,25 +119,48 @@ }; version = "0.3.0"; }; + faraday = { + dependencies = ["faraday-net_http" "json" "logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; + type = "gem"; + }; + version = "2.12.1"; + }; + faraday-net_http = { + dependencies = ["net-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + type = "gem"; + }; + version = "3.4.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; google-protobuf = { + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "1zzlmsv7djpgn6hxp5r1jg7f4nx368j0ccq6pipq1ncplnvbffij"; type = "gem"; }; - version = "3.25.3"; + version = "4.29.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -135,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"; + sha256 = "1xyinc2zaw25r3x774mni66im1b22l9zpbsqdgdb4g4zxcd5srcl"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -146,20 +179,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb"; + sha256 = "0z5x8f9k2m656imi59jrd49d8inbnzpcnylz0ijj1ly0ihdi3apd"; type = "gem"; }; - version = "1.56.2"; + version = "1.68.1"; }; grpc-tools = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm"; + sha256 = "12wbiq7s1qc6dv35p8c5vay627c6mqm9p1dimv2nz2m6r5f1057v"; type = "gem"; }; - version = "1.62.0"; + version = "1.68.1"; }; gssapi = { dependencies = ["ffi"]; @@ -193,6 +226,16 @@ }; version = "0.1.5"; }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + type = "gem"; + }; + version = "5.0.0"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -209,20 +252,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2"; + sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; + type = "gem"; + }; + version = "2.9.0"; + }; + jwt = { + dependencies = ["base64"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; + type = "gem"; + }; + version = "2.9.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -255,37 +319,47 @@ }; version = "1.1.10"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; + type = "gem"; + }; + version = "1.6.2"; + }; logging = { dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2024.0206"; + version = "3.2024.1203"; }; multi_json = { groups = ["default"]; @@ -297,16 +371,38 @@ }; version = "1.15.0"; }; + multi_xml = { + dependencies = ["bigdecimal"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg"; + type = "gem"; + }; + version = "0.7.1"; + }; net-ftp = { dependencies = ["net-protocol" "time"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; net-protocol = { dependencies = ["timeout"]; @@ -346,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.1"; + version = "7.3.0"; }; nori = { dependencies = ["bigdecimal"]; @@ -357,10 +453,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; + }; + oauth2 = { + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; + type = "gem"; + }; + version = "2.0.9"; + }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; }; pairing_heap = { groups = ["default"]; @@ -372,15 +489,25 @@ }; version = "3.1.0"; }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk"; + type = "gem"; + }; + version = "3.1.8"; + }; rake = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rake-compiler = { dependencies = ["rake"]; @@ -388,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji"; + sha256 = "0xlifh25mhlrigj020nya10s37dbkhc0rlqlf0ld88rxrdg1057k"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; rb-fsevent = { groups = ["default"]; @@ -409,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -430,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rgl = { dependencies = ["pairing_heap" "rexml" "stream"]; @@ -463,10 +590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -474,10 +601,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -485,10 +612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + sha256 = "1xjikikx2sn9b7nbaza60xq7livjw9kp3a6gwbv5xz9zjd7k2164"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -496,30 +623,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-support = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default"]; @@ -531,6 +659,17 @@ }; version = "2.3.2"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; + type = "gem"; + }; + version = "2.0.1"; + }; stream = { groups = ["default"]; platforms = []; @@ -557,20 +696,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; + sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.1"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; + sha256 = "06fcniirx82hrljzfn5wb3634n8648v8qgy006jzgclfz5gjvjla"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; + }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + type = "gem"; + }; + version = "1.0.2"; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -586,15 +735,25 @@ version = "0.0.1"; }; vagrant_cloud = { - dependencies = ["excon" "log4r" "rexml"]; + dependencies = ["excon" "log4r" "oauth2" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg"; + sha256 = "07w7zv93pzpxjsq16z2d15irkl117x2h572bmd0gqhqd50da3lc6"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; + }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6"; + type = "gem"; + }; + version = "1.1.4"; }; wdm = { groups = ["default"]; @@ -611,21 +770,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.7.0"; + version = "1.9.1"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.9"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; diff --git a/pkgs/by-name/va/vagrant/gemset_libvirt.nix b/pkgs/by-name/va/vagrant/gemset_libvirt.nix index d31b76a4e7f8..cc9b49f42d9f 100644 --- a/pkgs/by-name/va/vagrant/gemset_libvirt.nix +++ b/pkgs/by-name/va/vagrant/gemset_libvirt.nix @@ -1,38 +1,58 @@ { builder = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; + }; + diff-lcs = { + groups = ["default" "development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + type = "gem"; + }; + version = "1.5.1"; + }; + diffy = { + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; + type = "gem"; + }; + version = "3.4.3"; }; excon = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.92.3"; + version = "1.2.2"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; + sha256 = "1rjv4iqr64arxv07bh84zzbr1y081h21592b5zjdrk937al8mq1z"; type = "gem"; }; - version = "2.3.0"; + version = "2.6.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -43,18 +63,18 @@ }; fog-libvirt = { dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; + sha256 = "036ajdyj4fxnhqf108jgzjkpiknnr6dg7mrapn8jsagqdr2a2k21"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.1"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -64,7 +84,7 @@ version = "0.1.4"; }; formatador = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -74,48 +94,58 @@ version = "1.1.0"; }; json = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; type = "gem"; }; - version = "2.6.1"; + version = "2.9.0"; + }; + logger = { + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; + type = "gem"; + }; + version = "1.6.2"; }; mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; + dependencies = ["logger" "mime-types-data"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.4.1"; + version = "3.6.0"; }; mime-types-data = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2024.1203"; }; mini_portile2 = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.8"; }; multi_json = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -126,68 +156,122 @@ }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; + sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.8"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parallel_tests = { + dependencies = ["parallel"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04i61bkra454var9dc79ak3yffl13mbqx8xv2rvidx9n7ins9cyn"; + type = "gem"; + }; + version = "4.7.2"; }; racc = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; + }; + rake = { + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + type = "gem"; + }; + version = "13.2.1"; }; rexml = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.9"; }; - xml-simple = { - groups = ["default"]; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "1.1.9"; + version = "3.13.2"; }; - diffy = { - groups = ["default"]; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.4.2"; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + type = "gem"; + }; + version = "3.13.2"; + }; + rspec-support = { + groups = ["default" "development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; + type = "gem"; + }; + version = "3.13.2"; }; ruby-libvirt = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; + sha256 = "0r0igmwr22pi3dkkg1p79hjf8mr178qnz83q8fnaj87x7zk3qfyg"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.4"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; - groups = ["default"]; + dependencies = ["diffy" "fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple"]; + groups = ["plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -196,4 +280,15 @@ }; version = "0.12.2"; }; + xml-simple = { + dependencies = ["rexml"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; + type = "gem"; + }; + version = "1.1.9"; + }; } diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index 60d28318930a..6754a39fad4e 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/pkgs/by-name/va/vagrant/package.nix @@ -6,9 +6,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.4.1"; + version = "2.4.3"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k="; + hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -118,6 +118,5 @@ in buildRubyGem rec { license = licenses.bsl11; maintainers = with maintainers; [ tylerjl ]; platforms = with platforms; linux ++ darwin; - broken = true; # build fails on darwin and linux }; } diff --git a/pkgs/by-name/va/valum/package.nix b/pkgs/by-name/va/valum/package.nix index caf29a2cc027..2602324e8923 100644 --- a/pkgs/by-name/va/valum/package.nix +++ b/pkgs/by-name/va/valum/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl -, libgee, libsoup, fcgi }: +, libgee, libsoup_2_4, fcgi }: stdenv.mkDerivation rec { pname = "valum"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; + buildInputs = [ glib vala ctpl libgee libsoup_2_4 fcgi ]; meta = with lib; { homepage = "https://github.com/valum-framework/valum"; diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 6a2108e67573..9c3fedbf3ad6 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-HlT7ddlrMHG1qOCqdaYjuWhJD+5FF1Nkv2sfXLWd07o="; + hash = "sha256-zvyDKgNTRha7Z7KGAA7x9LRJrL+1zyb5TZEFFK8Ffrc="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-BOVjbaDbZw6H6X8o945M0Bx6fqnRQjFBviOLkTYVJ1I="; + hash = "sha256-GSAOdvd8X4dQNTDZMnzc4oMY54TKvdPuAOMb6DRzCEM="; }; nativeBuildInputs = diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index 901afe1da275..d1f6e6abcb28 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -6,21 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "viddy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; rev = "v${version}"; - hash = "sha256-lk992sI5kXo5Q8+rgBCKo/knV3/6uPs83Zj27JQcR6M="; + hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0="; }; - cargoHash = "sha256-9xXUlsRGKw0rvIYAr4pMDh6oD/ZjBYPaL0g6dCC5sCo="; + cargoHash = "sha256-d/wmjvbTITpcGCrMVZrkUcCFPDdas2CDDPlIqoVBl9k="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; - env.VERGEN_BUILD_DATE = "2024-11-16"; # managed via the update script + env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; passthru.updateScript.command = [ ./update.sh ]; diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix index ab40f15b50ae..9345a5f7023c 100644 --- a/pkgs/by-name/vi/villain/package.nix +++ b/pkgs/by-name/vi/villain/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "villain"; - version = "2.2.0"; + version = "2.2.1"; pyproject = false; src = fetchFromGitHub { owner = "t3l3machus"; repo = "Villain"; - rev = "v${version}"; - hash = "sha256-7qZ91WEzQg9k9V/FlREW4YLlEnloeVkisDO8q/+bheo="; + rev = "refs/tags/V${version}"; + hash = "sha256-eIPxidBBVmjt/E1F8G3zPwteB1qsk3a5LD69CiNVApY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index e02e07419ea1..0a629030f210 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup_2_4, webkitgtk_4_0, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; - buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup_2_4 webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; passthru = { inherit gtk3; diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix similarity index 51% rename from pkgs/applications/video/vokoscreen-ng/default.nix rename to pkgs/by-name/vo/vokoscreen-ng/package.nix index 29b6c2c712d3..5471c64543d6 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -1,34 +1,35 @@ -{ fetchFromGitHub -, gst_all_1 -, gst-plugins-bad -, gst-plugins-base -, gst-plugins-good -, gst-plugins-ugly -, gstreamer -, lib -, libX11 -, pipewire -, pkg-config -, pulseaudio -, qt6 -, stdenv -, wayland +{ + fetchFromGitHub, + gst_all_1, + lib, + libX11, + pipewire, + pkg-config, + pulseaudio, + qt6, + stdenv, + wayland, }: stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; - rev = version; - hash = "sha256-PLgKOdSx0Kdobex5KaeCxWcindHEN9p4+xaVN/gr7Pk="; + rev = "refs/tags/${version}"; + hash = "sha256-efgvq/jl/ecjtINy5BdqtYRp2gxEvOsMzQVyCZ3ig+Q="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; - nativeBuildInputs = [ qt6.qttools pkg-config qt6.qmake qt6.wrapQtAppsHook ]; + nativeBuildInputs = [ + qt6.qttools + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; buildInputs = [ gst_all_1.gstreamer libX11 @@ -43,29 +44,32 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly ]; - postPatch = '' - substituteInPlace src/vokoscreenNG.pro \ - --replace lrelease-qt5 lrelease - ''; - + # TODO: translations don't get built by the qmake project preBuild = '' lrelease src/language/*.ts ''; - postInstall = '' - mkdir -p $out/bin $out/share/applications $out/share/icons - cp ./vokoscreenNG $out/bin/ - cp ./src/applications/vokoscreenNG.desktop $out/share/applications/ - cp ./src/applications/vokoscreenNG.png $out/share/icons/ + # upstream doesn't provide an install target + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin vokoscreenNG + install -Dm644 -t $out/share/applications src/applications/vokoscreenNG.desktop + install -Dm644 -t $out/share/icons src/applications/vokoscreenNG.png + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - wrapQtApp $out/bin/vokoscreenNG + + runHook postInstall ''; meta = with lib; { description = "User friendly Open Source screencaster for Linux and Windows"; license = licenses.gpl2Plus; homepage = "https://github.com/vkohaupt/vokoscreenNG"; - maintainers = with maintainers; [ shamilton dietmarw ]; + maintainers = with maintainers; [ + shamilton + dietmarw + ]; platforms = platforms.linux; mainProgram = "vokoscreenNG"; }; diff --git a/pkgs/by-name/vt/vtm/package.nix b/pkgs/by-name/vt/vtm/package.nix index 33f866dd56d7..ce9c41638e16 100644 --- a/pkgs/by-name/vt/vtm/package.nix +++ b/pkgs/by-name/vt/vtm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.35"; + version = "0.9.99.55"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-XPBInofzFNBMuJ0oP7ZooDuRukuXBWkEzdEq09MHykA="; + hash = "sha256-eF5z+w64uIY7k/g4Z2Ynuz8PGyxpy6cOFIyUtV2VkxU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix new file mode 100644 index 000000000000..d698760dbf22 --- /dev/null +++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + libX11, + meson, + ninja, + pkg-config, + vulkan-headers, + vulkan-loader, + wayland-scanner, + wayland, +}: + +stdenv.mkDerivation rec { + pname = "vulkan-hdr-layer-kwin6"; + version = "0-unstable-2024-10-19"; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + cmake + wayland-scanner + ]; + + buildInputs = [ + vulkan-headers + vulkan-loader + libX11 + wayland + ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "Zamundaaa"; + repo = "VK_hdr_layer"; + rev = "e173f2617262664901039e3c821929afce05d2c1"; + hash = "sha256-hBxRwbn29zFeHcRpfMF6I4piSASpN2AvZY0ci5Utj4U="; + fetchSubmodules = true; + }; + + meta = { + description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)"; + homepage = "https://github.com/Zamundaaa/VK_hdr_layer"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ d4rk ]; + }; +} diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 7f5c9ad4432b..8fcd8869a282 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -55,6 +55,7 @@ jackSupport ? true, mpdSupport ? true, mprisSupport ? stdenv.hostPlatform.isLinux, + niriSupport ? true, nlSupport ? true, pipewireSupport ? true, pulseSupport ? true, @@ -187,7 +188,10 @@ stdenv.mkDerivation (finalAttrs: { "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; }) - ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + ++ (lib.mapAttrsToList lib.mesonBool { + "experimental" = experimentalPatches; + "niri" = niriSupport; + }); env = lib.optionalAttrs systemdSupport { PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index 251d72a3f550..a11a3d43579d 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -6,8 +6,7 @@ pkg-config, libusb1, nix-update-script, - testers, - wchisp, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -27,11 +26,11 @@ rustPlatform.buildRustPackage rec { libusb1 ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = wchisp; - }; }; meta = { diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index a3586299ad25..fd9b1311182c 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cargo-tauri, - libsoup, + libsoup_3, nodejs, openssl, pkg-config, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libsoup + libsoup_3 openssl webkitgtk_4_1 ]; diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 7734b0d6f585..d50644d1c215 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "weaver"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; rev = "v${version}"; - hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ="; + hash = "sha256-xb6u9+cZ7p3b2S+I/mQtBfc7XsVlbeLSMHY3fhS+8/8="; }; - cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y="; + cargoHash = "sha256-+Swg1ROVO2lVctF7j6Nibx+WPpE2KAdZSeowinXjnmo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ] diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index 3bf64898b6f4..69eebc4f1d41 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { perlPackages.perl ]; + strictDeps = true; + configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") @@ -101,7 +103,8 @@ stdenv.mkDerivation rec { sed -i 's/^exit/exit 77 #/' $f done ''; - checkInputs = + + nativeCheckInputs = [ perlPackages.HTTPDaemon python3 diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index b09bc4c69fa8..5703b6c68f38 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -7,8 +7,7 @@ libusb1, udev, nix-update-script, - testers, - wlink, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -29,11 +28,11 @@ rustPlatform.buildRustPackage rec { udev ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = wlink; - }; }; meta = { diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix index 6af5e5da6cf1..018b5bd3060d 100644 --- a/pkgs/by-name/xp/xplorer/package.nix +++ b/pkgs/by-name/xp/xplorer/package.nix @@ -5,7 +5,7 @@ , fetchYarnDeps , freetype , gtk3 -, libsoup +, libsoup_2_4 , stdenvNoCC , yarnConfigHook , yarnBuildHook @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage { ''; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ]; + buildInputs = [ dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0 ]; checkFlags = [ # tries to mutate the parent directory diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix index 976624c16b60..6bfc252145ad 100644 --- a/pkgs/by-name/xs/xsubfind3r/package.nix +++ b/pkgs/by-name/xs/xsubfind3r/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "xsubfind3r"; - version = "0.7.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xsubfind3r"; rev = "refs/tags/${version}"; - hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8="; + hash = "sha256-vmcuIa/ebCggLIALbfljJr92GE6veYEl3glm5gH9IZM="; }; - vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8="; + vendorHash = "sha256-PFeUO3LWNBF4KPSHBxRIczIMR002Xzydcy6FyjKP60A="; ldflags = [ "-s" @@ -23,10 +24,10 @@ buildGoModule rec { meta = with lib; { description = "CLI utility to find subdomains from curated passive online sources"; - mainProgram = "xsubfind3r"; homepage = "https://github.com/hueristiq/xsubfind3r"; changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "xsubfind3r"; }; } diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 7da4db2e7af3..f25fc13ed613 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.12.3"; + version = "2024.12.6"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ="; + hash = "sha256-dD2+CB6ocb4/X/CD4s2V2oZt6nc/xwrmsQmDjPv3KsQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix new file mode 100644 index 000000000000..63a8f7a25262 --- /dev/null +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -0,0 +1,92 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + zenoh, +}: +rustPlatform.buildRustPackage rec { + pname = "zenoh"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eclipse-zenoh"; + repo = "zenoh"; + rev = version; + hash = "sha256-3k266sIP3A76HlFGUax4XIVQqwCKSvShJuBIuNWKJ2c="; + }; + + cargoHash = "sha256-Ny7kLFJveibDmi48a5KS0GKumX4RUAkoeh66tx9oR5g="; + + cargoBuildFlags = [ + "--workspace" + # exclude examples + "--exclude" + "examples" + "--exclude" + "zenoh-backend-example" + "--exclude" + "zenoh-plugin-example" + "--exclude" + "zenoh-ext-examples" + ]; + + checkFlags = [ + # thread 'test_liveliness_query_clique' panicked at zenoh/tests/liveliness.rs:103:43: + # called `Result::unwrap()` on an `Err` value: Can not create a new TCP listener bound to tcp/localhost:47448... + "--skip test_liveliness_query_clique" + # thread 'test_liveliness_subscriber_double_client_history_middle' panicked at zenoh/tests/liveliness.rs:845:43: + # called `Result::unwrap()` on an `Err` value: Can not create a new TCP listener bound to tcp/localhost:47456... + "--skip test_liveliness_subscriber_double_client_history_middle" + # thread 'zenoh_matching_status_remote' panicked at zenoh/tests/matching.rs:155:5: + # assertion failed: received_status.ok().flatten().map(|s| + # s.matching_subscribers()).eq(&Some(true)) + "--skip zenoh_matching_status_remote" + # thread 'qos_pubsub' panicked at zenoh/tests/qos.rs:50:18: + # called `Result::unwrap()` on an `Err` value: Elapsed(()) + "--skip qos_pubsub" + # never ending tests + "--skip router_linkstate" + "--skip three_node_combination" + "--skip three_node_combination_multicast" + # Error: Timeout at zenoh/tests/routing.rs:453. + "--skip gossip" + # thread 'zenoh_session_multicast' panicked at zenoh/tests/session.rs:85:49: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.0.0.1:17448... + "--skip zenoh_session_multicast" + # thread 'tests::transport_multicast_compression_udp_only' panicked at io/zenoh-transport/tests/multicast_compression.rs:170:86: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.24.220.245:21000... + "--skip tests::transport_multicast_compression_udp_only" + # thread 'tests::transport_multicast_udp_only' panicked at io/zenoh-transport/tests/multicast_transport.rs:167:86: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.52.216.110:20000... + "--skip tests::transport_multicast_udp_only" + # thread 'openclose_tcp_only_connect_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:764:63: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_tcp_only_connect_with_interface_restriction" + # thread 'openclose_udp_only_listen_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:820:72: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_tcp_only_listen_with_interface_restriction" + # thread 'openclose_tcp_only_listen_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:783:72: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_udp_only_connect_with_interface_restriction" + # thread 'openclose_udp_only_connect_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:802:63: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_udp_only_listen_with_interface_restriction" + ]; + + passthru.tests.version = testers.testVersion { + package = zenoh; + version = "v" + version; + }; + + meta = { + description = "Communication protocol that combines pub/sub with key value storage and computation"; + longDescription = "Zenoh unifies data in motion, data in-use, data at rest and computations. It carefully blends traditional pub/sub with geo-distributed storages, queries and computations, while retaining a level of time and space efficiency that is well beyond any of the mainstream stacks"; + homepage = "https://zenoh.io"; + changelog = "https://github.com/eclipse-zenoh/zenoh/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ck3d ]; + mainProgram = "zenohd"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 2431c176a55d..e256a1dfd398 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "0.5.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; - rev = "v${version}"; - hash = "sha256-dYM8Zkri0H/olODF2weOqdVg1NcPltzu1PZ92IbGLVE="; + rev = "refs/tags/v${version}"; + hash = "sha256-NNPY73G1DNxN6D/h73teldF8m1sObP0BufRRtlFI0xo="; }; - cargoHash = "sha256-18DWe1MHABz1SMg72NcYTSCGvevchqZ3asb8+lg5MwE="; + cargoHash = "sha256-I8kKSIRYLbSFGUNGXmBA1UfgJeMXZgBCKDTnqXkTJcE="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 9604662d77d0..27f9b0a4cc2a 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -74,7 +74,7 @@ buildNpmPackage rec { homepage = "https://zulip.com"; license = licenses.asl20; maintainers = with maintainers; [ andersk ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; mainProgram = "zulip"; }; } diff --git a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json index 3d201fd4cf07..ac13c29be107 100644 --- a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json +++ b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json @@ -97,7 +97,7 @@ }, { "caskName": "comic-shanns-mono", - "description": "The very typeface you\u2019ve been trained to recognize since childhood", + "description": "The very typeface you’ve been trained to recognize since childhood", "folderName": "ComicShannsMono", "licenseId": "MIT", "patchedName": "ComicShannsMono", @@ -217,7 +217,7 @@ }, { "caskName": "hack", - "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera & DejaVu, legible at common sizes", + "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera & DejaVu, legible at common sizes", "folderName": "Hack", "licenseId": "Bitstream-Vera AND MIT", "patchedName": "Hack", @@ -281,7 +281,7 @@ }, { "caskName": "intone-mono", - "description": "Expressive monospaced font family that\u2019s built with clarity, legibility, and the needs of developers in mind", + "description": "Expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind", "folderName": "IntelOneMono", "licenseId": "OFL-1.1-RFN", "patchedName": "IntoneMono", @@ -377,7 +377,7 @@ }, { "caskName": "monoid", - "description": "Ligatures, distinguishable glyphs with short ascenders & descenders, large operators & punctuation", + "description": "Ligatures, distinguishable glyphs with short ascenders & descenders, large operators & punctuation", "folderName": "Monoid", "licenseId": "MIT OR OFL-1.1-no-RFN", "patchedName": "Monoid", @@ -513,7 +513,7 @@ }, { "caskName": "ubuntu-mono", - "description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design", + "description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design", "folderName": "UbuntuMono", "licenseId": "LicenseRef-UbuntuFont", "patchedName": "UbuntuMono", diff --git a/pkgs/data/fonts/nerd-fonts/update.py b/pkgs/data/fonts/nerd-fonts/update.py index 315609da9bf8..026e293c0569 100755 --- a/pkgs/data/fonts/nerd-fonts/update.py +++ b/pkgs/data/fonts/nerd-fonts/update.py @@ -3,6 +3,7 @@ import os import urllib.request as ureq import json +import html if not all( f"UPDATE_NIX_{v}" in os.environ @@ -28,12 +29,12 @@ def fetchjson(url): def storejson(path, obj): with open(path, "w", encoding="utf-8") as f: - json.dump(obj, f, indent=2) + json.dump(obj, f, indent=2, ensure_ascii=False) # Needed to satisfy EditorConfig's rules f.write('\n') def slicedict(d, ks): - return {k: d[k] for k in ks} + return {k: html.unescape(d[k]) for k in ks} os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests")) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 67af761d3a38..83a163f4e36c 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -31,28 +31,33 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -} // lib.optionalAttrs config.allowAliases { - inherit (pkgs) - # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gtkmm2 libcanberra-gtk2 +}) // lib.optionalAttrs config.allowAliases { + # added 2024-12-02 + glib = throw "gnome2.glib has been removed, please use top-level glib"; + glibmm = throw "gnome2.glibmm has been removed, please use top-level glibmm"; + atk = throw "gnome2.atk has been removed, please use top-level atk"; + atkmm = throw "gnome2.atkmm has been removed, please use top-level atkmm"; + cairo = throw "gnome2.cairo has been removed, please use top-level cairo"; + pango = throw "gnome2.pango has been removed, please use top-level pango"; + pangomm = throw "gnome2.pangomm has been removed, please use top-level pangomm"; + gtkmm2 = throw "gnome2.gtkmm2 has been removed, please use top-level gtkmm2"; + libcanberra-gtk2 = throw "gnome2.libcanberra-gtk2 has been removed, please use top-level libcanberra-gtk2"; + libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup_2_4"; + libwnck2 = throw "gnome2.libwnck2 has been removed, please use top-level libwnck2"; + gtk-doc = throw "gnome2.gtk-doc has been removed, please use top-level gtk-doc"; + gnome-doc-utils = throw "gnome2.gnome-doc-utils has been removed, please use top-level gnome-doc-utils"; + gvfs = throw "gnome2.gvfs has been removed, please use top-level gvfs"; + gtk = throw "gnome2.gtk has been removed, please use top-level gtk2"; + gtkmm = throw "gnome2.gtkmm has been removed, please use top-level gtkmm2"; + gtkdoc = throw "gnome2.gtkdoc has been removed, please use top-level gtk-doc"; + startup_notification = throw "gnome2.startup_notification has been removed, please use top-level libstartup_notification"; + startupnotification = throw "gnome2.startupnotification has been removed, please use top-level libstartup_notification"; + gnomedocutils = throw "gnome2.gnomedocutils has been removed, please use top-level gnome-doc-utils"; + gnome-icon-theme = throw "gnome2.gnome-icon-theme has been removed, please use top-level gnome-icon-theme"; + gnome_icon_theme = throw "gnome2.gnome_icon_theme has been removed, please use top-level gnome-icon-theme"; + gnomeicontheme = throw "gnome2.gnomeicontheme has been removed, please use top-level gnome-icon-theme"; + gnome_common = throw "gnome2.gnome_common has been removed, please use top-level gnome-common"; - # Included for backwards compatibility - libsoup libwnck2 gtk-doc gnome-doc-utils - - gvfs # added 2019-09-03 - ; - - gtk = pkgs.gtk2; - gtkmm = pkgs.gtkmm2; - - gtkdoc = pkgs.gtk-doc; - startup_notification = pkgs.libstartup_notification; - startupnotification = pkgs.libstartup_notification; - gnomedocutils = pkgs.gnome-doc-utils; - gnome-icon-theme = pkgs.gnome-icon-theme; - gnome_icon_theme = self.gnome-icon-theme; - gnomeicontheme = self.gnome-icon-theme; - gnome_common = gnome-common; gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27 @@ -69,4 +74,4 @@ lib.makeScope pkgs.newScope (self: with self; { libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27 libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15 python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 -}) +} diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix new file mode 100644 index 000000000000..cb63a2cb8ac3 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -0,0 +1,166 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + nixosTests, + cmake, + gettext, + gst_all_1, + lomiri-action-api, + lomiri-content-hub, + lomiri-ui-toolkit, + pkg-config, + qtbase, + qtdeclarative, + qtmultimedia, + qtxmlpatterns, + wrapGAppsHook3, + wrapQtAppsHook, + xvfb-run, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-mediaplayer-app"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-mediaplayer-app"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Pq1TA7eoHDRRzr6zT2cmIye91uz/0YsmQ8Qp79244wg="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/35 merged & in release + (fetchpatch { + name = "0001-lomiri-mediaplayer-app-Fix-GNUInstallDirs-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/baaa0ea7cba2a9f8bc7f223246857eba1cd5d8e4.patch"; + hash = "sha256-RChPRi4zrAWJEl4Urznh5FRYuTnxCFzG+gZurrF7Ym0="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/36 merged & in release + (fetchpatch { + name = "0002-lomiri-mediaplayer-app-Drop-NO_DEFAULT_PATH-for-qmltestrunner.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/3bf4ebae7eb59176af984d07ad72b67ee0bd1b8f.patch"; + hash = "sha256-dJCW0dKe7Tq1Mg9CSdVQHamObVrPS7COXsdv41SWnHg="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/37 merged & in release + (fetchpatch { + name = "0003-lomiri-mediaplayer-app-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/df1aadb82d73177133bc096307ec1ef1e2b0c2ed.patch"; + hash = "sha256-dvkGjG0ptCmLDIAWzDjOzu+Q/5bgVdb/+RmE6v8fV0Q="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/38 merged & in release + (fetchpatch { + name = "0004-lomiri-mediaplayer-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/bd927e823205214f9ea01dfb1f93171a8952ecf9.patch"; + hash = "sha256-/lg0elv9weNnRGq1oD94/sE511EZ0TmXZsURcauQobI="; + }) + (fetchpatch { + name = "0005-lomiri-mediaplayer-app-Fix-title-localisation.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/c4cba819dd55e7e85c4ea496626bed9aa78470a5.patch"; + hash = "sha256-EiUxaCa5ANnRSciB8IodQOGnmG4rE/g/M+K4XcyqTI8="; + }) + ]; + + postPatch = '' + # We don't want absolute paths in desktop files + substituteInPlace data/lomiri-mediaplayer-app.desktop.in.in \ + --replace-fail 'Icon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_ICON@' 'Icon=lomiri-mediaplayer-app' \ + --replace-fail 'X-Lomiri-SymbolicIcon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SYMBOLIC_ICON@' 'X-Lomiri-SymbolicIcon=lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg' \ + --replace-fail 'X-Lomiri-Splash-Image=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-mediaplayer-app.svg' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + wrapQtAppsHook + ]; + + buildInputs = + [ + qtbase + qtmultimedia + + # QML + lomiri-action-api + lomiri-content-hub + lomiri-ui-toolkit + qtxmlpatterns + ] + # QtMultimedia playback support + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + nativeCheckInputs = [ + qtdeclarative # qmltestrunner + xvfb-run + ]; + + checkInputs = [ lomiri-ui-toolkit ]; + + dontWrapGApps = true; + + cmakeFlags = [ (lib.cmakeBool "ENABLE_AUTOPILOT" false) ]; + + # Only test segfaults in Nix sandbox, see LSS for details + doCheck = false; + + preCheck = + let + listToQtVar = + list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list; + in + '' + export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${ + listToQtVar [ + lomiri-ui-toolkit + qtmultimedia + qtxmlpatterns + ] qtbase.qtQmlPrefix + } + ''; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/256x256/apps,lomiri-app-launch/{symbolic,splash}} + + ln -s $out/share/{lomiri-mediaplayer-app,icons/hicolor/256x256/apps}/lomiri-mediaplayer-app.png + ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-splash.svg,lomiri-app-launch/splash/lomiri-mediaplayer-app.svg} + ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-symbolic.svg,lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg} + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru = { + tests.vm = nixosTests.lomiri-mediaplayer-app; + updateScript = gitUpdater { }; + }; + + meta = { + description = "Media Player application for Ubuntu Touch devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ + gpl3Only + cc-by-sa-30 + ]; + mainProgram = "lomiri-mediaplayer-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 24734c5a6ecc..0f60cdb9cac9 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -20,6 +20,7 @@ let lomiri-docviewer-app = callPackage ./applications/lomiri-docviewer-app { }; lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { }; + lomiri-mediaplayer-app = callPackage ./applications/lomiri-mediaplayer-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4c003c4a9873..68cf463f7594 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -7,7 +7,7 @@ , glib-networking , libxml2 , gtk3 -, libsoup +, libsoup_2_4 , tzdata , mateUpdateScript }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 tzdata ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5cab3288bd35..29404706ac67 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -19,7 +19,7 @@ , libgit2-glib , libhandy , libpeas -, libsoup +, libsoup_2_4 , vte , ctags }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { libgit2-glib libhandy libpeas - libsoup + libsoup_2_4 vte ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 12746579c499..c2b6f314f838 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -17,7 +17,7 @@ , elementary-dock , bamf , switchboard-with-plugs -, libsoup +, libsoup_2_4 , wingpanel , zeitgeist , bc @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { json-glib libgee libhandy - libsoup + libsoup_2_4 switchboard-with-plugs wingpanel zeitgeist diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index a413498447ba..bd87eef9115d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -15,7 +15,7 @@ , libgee , libhandy , libxml2 -, libsoup +, libsoup_2_4 , elementary-calendar }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libgee libhandy libical - libsoup + libsoup_2_4 wingpanel ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index db7614394cb6..9d8d80fed106 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -7,7 +7,7 @@ , gtk3 , json_c , libxml2 -, libsoup +, libsoup_2_4 , upower , libxfce4ui , libxfce4util @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gtk3 json_c libxml2 - libsoup + libsoup_2_4 upower libxfce4ui libxfce4util diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index e86488b3151d..16f6e69ac23b 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-reEPkJpoTCoFa4sOw6MOFXDOK4PEbF9iGkRk0Ccpr58=", + "tarballHash": "sha256-LhnsYVr+I+MY0Vu3y86rsAs8j7jNyo06SguY6uZkEcc=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-Cxjdi7vISz2wMT22o4ZOEd9RdmKHI8PO/JgH1YJWsVo=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index fe1ac1e23910..09dbce37a9bf 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { "release": "9.0.0", "channel": "9.0", - "tag": "v9.0.0", - "sdkVersion": "9.0.100", + "tag": "v9.0.101", + "sdkVersion": "9.0.101", "runtimeVersion": "9.0.0", "aspNetCoreVersion": "9.0.0", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff" + "sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3" } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 2b5554b2eb94..b745a40e878f 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -4,6 +4,7 @@ dotnetPackages: makeWrapper, lib, symlinkJoin, + callPackage, }: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: @@ -12,15 +13,16 @@ dotnetPackages: # 3. Something else? let cli = builtins.head dotnetPackages; + mkWrapper = callPackage ./wrapper.nix { }; in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ];`''; -(buildEnv { - name = "dotnet-core-combined"; - paths = map (x: x.unwrapped) dotnetPackages; +mkWrapper "sdk" (buildEnv { + name = "dotnet-combined"; + paths = dotnetPackages; pathsToLink = map (x: "/share/dotnet/${x}") [ "host" "packs" @@ -34,7 +36,7 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' postBuild = '' mkdir -p "$out"/share/dotnet - cp "${cli.unwrapped}"/share/dotnet/dotnet $out/share/dotnet + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet cp -R "${cli}"/nix-support "$out"/ mkdir "$out"/bin ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet @@ -43,6 +45,8 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' ln -s ${cli.man} $man ''; passthru = { + pname = "dotnet"; + version = "combined"; inherit (cli) icu; versions = lib.catAttrs "version" dotnetPackages; @@ -53,9 +57,4 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' }; inherit (cli) meta; -}).overrideAttrs - ({ - outputs = [ - "out" - ] ++ lib.optional (cli ? man) "man"; - }) +}) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 4fa837a4a274..2a91d1fcfddc 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -18,7 +18,7 @@ }: let - inherit (lib.importJSON releaseManifestFile) channel release; + inherit (lib.importJSON releaseManifestFile) channel tag; pkg = stdenvNoCC.mkDerivation { name = "update-dotnet-vmr-env"; @@ -93,15 +93,11 @@ writeScript "update-dotnet-vmr.sh" '' tmp="$(mktemp -d)" trap 'rm -rf "$tmp"' EXIT - echo ${lib.escapeShellArg (toString ./update.sh)} \ - -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo - cd "$tmp" curl -fsSL "$releaseUrl" -o release.json - release=$(jq -r .release release.json) - if [[ -z $tag && "$release" == "${release}" ]]; then + if [[ -z $tag && "$tagName" == "${tag}" ]]; then >&2 echo "release is already $release" exit fi diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 7e8e6bfc880f..66520f4658fd 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -281,15 +281,18 @@ update() { # If patch was not specified, check if the package is already the latest version # If it is, exit early if [ "$patch_specified" == false ] && [ -f "$output" ]; then - local current_version - current_version=$(nix-instantiate --eval -E "(import $output { \ - buildAspNetCore = { ... }: {}; \ - buildNetSdk = { ... }: {}; \ - buildNetRuntime = { ... }: {}; \ - fetchNupkg = { ... }: {}; \ - }).release_${major_minor_underscore}" | jq -r) - - if [[ "$current_version" == "$major_minor_patch" ]]; then + local -a versions + IFS= readarray -d '' versions < <( + nix-instantiate --eval --json -E "with (import $output { + buildAspNetCore = { ... }: {}; + buildNetSdk = { version, ... }: { inherit version; }; + buildNetRuntime = { version, ... }: { inherit version; }; + fetchNupkg = { ... }: {}; + }); (x: builtins.deepSeq x x) [ + runtime_${major_minor_underscore}.version + sdk_${major_minor_underscore}.version + ]" | jq --raw-output0 .[]) + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return fi diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index b8af661041b3..3afb110ccbd7 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -204,39 +204,39 @@ in rec { }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100"; + version = "9.0.101"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/526d93c5-bae2-4cfc-a9cf-b2d28d7b5c98/17c926df21958999f74992973837d261/dotnet-sdk-9.0.100-linux-arm.tar.gz"; - hash = "sha512-3gbonlWbx2P/Z3O8+FLZFexH8tifTnBluggA2pmrVjV/MUNzkad9cJbkBfYzGGJbDLB09rQQA2++kG/OfzeU6A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fa0fa6b6-8db2-441e-a393-2dd2f5c841b9/19b664790a03e20ce4069449eaa74b21/dotnet-sdk-9.0.101-linux-arm.tar.gz"; + hash = "sha512-zfiYnQLkpqoh5oCB6VYxjJTGAVg6dX1etDORnr5/pRjyB6oPWKCe4oz5X0RcSGOGwineaYkUM6SikUXvWWqhpA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f79d99b-dc38-4c44-a549-32329419bb9f/a411ec38fb374e3a4676647b236ba021/dotnet-sdk-9.0.100-linux-arm64.tar.gz"; - hash = "sha512-aERQ5tH3xxH//b8yorhqky0XpR9HQr0npCieMZxbJPZ0NVP8fgrRxxY+RI7VxAzR7PQZiy5oGsxGItjmGTpc8g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/93a7156d-01ef-40a1-b6e9-bbe7602f7e8b/3c93e90c63b494972c44f073e15bfc26/dotnet-sdk-9.0.101-linux-arm64.tar.gz"; + hash = "sha512-xfnBfd7VEBy0tlrRAzrk2C/FsEMDvc5OthptxH76hCAr1ybQXK8RflNqAb14rXc7jSPL9DvGVeXrmRKxIHjgsQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/308f16a9-2ecf-4a42-b8bb-c1233de985fd/be6e87045ab21935bd8bb98ce69026c4/dotnet-sdk-9.0.100-linux-x64.tar.gz"; - hash = "sha512-f2m9oEfeH5Uihr4zCl6FgXHe2VLRqiQWnmIhL5CicUnmO2NsiK0xOm4+yGDaMfjFR/9KtoCBA6Bw9/smupnBxw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d74fd2dd-3384-4952-924b-f5d492326e35/e91d8295d4cbe82ba3501e411d78c9b8/dotnet-sdk-9.0.101-linux-x64.tar.gz"; + hash = "sha512-kbN+/WQkLl8fPCAl0YPrNOF/OpJxxWAvKd33lIRe7hA3I++VXthpeI6/WnMejdxpMoeZySxkyxGOEyjSWaatAQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c77904f4-57f5-46cf-bf99-d0dd1e4b9b3b/d7b454d3500c1a930b38e39a916aa38f/dotnet-sdk-9.0.100-linux-musl-arm.tar.gz"; - hash = "sha512-sJIPgOhmp2A86mKKETDfADvF14GCdciliCoxxuTinwcyL8XP2HMziT5BMb2WEw+yOE0AjLrXBAIsiSZ9UmhuBw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5528c94e-1708-4291-917f-c9b693df3389/b851b22328c11e88f9fb61ea3e18582f/dotnet-sdk-9.0.101-linux-musl-arm.tar.gz"; + hash = "sha512-fmVg5puDueZJYekRVfhYVCHDos52iXhx04ZJLGI+koD2byKE3Ek2K8OHOeSBclI85UsiaVJENzlOo+kIcooBGA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ca5a82b7-704c-4405-bde2-4bde4b932d2e/0332e51e8d339cbc0410079f911205f3/dotnet-sdk-9.0.100-linux-musl-arm64.tar.gz"; - hash = "sha512-2uBtAHMn9vU/UMs6KIS5PNL8u3PHVqisX/ZzYX+b3wAJOTLzqDZSIR/C7rV8JxB4ZE71wopCiX2Dl/dtDolYbQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a8f1d5c7-c724-451c-8659-fe6ea4e72ea8/1c90dea91c1e117b96198bdccdc0b594/dotnet-sdk-9.0.101-linux-musl-arm64.tar.gz"; + hash = "sha512-am1qbW372stIN0wKyb2xyTeB85cMh3iwvuHxWaIrABdoaCZOYFMx/vgzy5/tgptP/UFCdtDRFAqLDiVxlcLzdA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/404c65f4-7595-4792-85ab-e26084ebb5cf/db570cf4dc8d0a61270243c61fbdf619/dotnet-sdk-9.0.100-linux-musl-x64.tar.gz"; - hash = "sha512-4gMua07Zmts6krfgQeqJXuCcbtJFWh9o5V7VO9YTyMIO9KpcQ0OTu1/bwvVjWoMGf3dFH+L9P+vO4mT+B3rNqg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/73c11b94-0188-458f-b599-f7591718fc28/c44e21ffbf353b50ef88a76122e89e24/dotnet-sdk-9.0.101-linux-musl-x64.tar.gz"; + hash = "sha512-P04U+3tS37V7HjHLWXPm4KM49/Aw8SswgtO1XxL5WH3fSSanxfz4a3ZxOX5E+OXCD7lJ1w6afdDcJ75zpUjf/A=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4569c514-16ac-49fc-ac41-4416f547c249/851fb0aa9b2a8bdcb0d1d9f9493a952e/dotnet-sdk-9.0.100-osx-arm64.tar.gz"; - hash = "sha512-lN+kllIZWohPBtBs6yPvb31zgP4MQBW5bo+VC1epVYcR+6YRKHEPnI3gCB3ZGvSKkPe9D4uQA4rrWusk+2ck/w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6707b71c-f95b-46b9-a4f8-067922291242/93d5be41bfa39461c47bae856a8ad93c/dotnet-sdk-9.0.101-osx-arm64.tar.gz"; + hash = "sha512-xmCO0oDlp2xGzo+bBrjHAUx721SpeVxFhd644FfbTVJAN+ToL5yvMkRO7eQnyctf27ciUI84nviahk8LuuR2ag=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/cab5bf72-f0c7-46c7-a8f2-074f71e4b6ca/a14ec2fc3b6fd32d47b4293994ab3c61/dotnet-sdk-9.0.100-osx-x64.tar.gz"; - hash = "sha512-We8yAol5arvcVzA20NG0qhkZyDFAt6NjF0q9aL5cwCUnQVRqIdRsIBWGMx9fkhF4e9GbU4G5AvO9fCJiIDRK6Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz"; + hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 3e492491afd7..fe09151fb8fe 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -46,8 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p "$out"/bin "$out"/share/dotnet + mkdir -p "$out"/bin "$out"/share ln -s "$src"/bin/* "$out"/bin + ln -s "$src"/share/dotnet "$out"/share runHook postInstall ''; @@ -125,8 +126,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ) ( lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime.unwrapped}/share/dotnet + export DOTNET_ROOT=${runtime}/share/dotnet '' + run ); diff --git a/pkgs/development/compilers/ghc/9.8.4.nix b/pkgs/development/compilers/ghc/9.8.4.nix new file mode 100644 index 000000000000..2596249a70b4 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.8.4.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.4"; + sha256 = "17e8188f3c8a5c2f73fb4e35d01032e8dc258835ec876d52c8ad8ee3d24b2fc5"; +} diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index d59a6b4f51fb..bbf1173f1b00 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -54,16 +54,13 @@ in { nativeBuildInputs = [ dejagnu - expat gmp guile libipt mpfr - ncurses5 python3 readline sourceHighlight - xz zlib ] ++ lib.optionals stdenv.buildPlatform.isLinux [ autoPatchelfHook @@ -72,6 +69,14 @@ in { elfutils ]; + buildInputs = [ + expat + ncurses5 + xz + ]; + + strictDeps = true; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) '' substituteInPlace lib/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders.conf \ --replace "SYSTEM_HEADER_DIR=\"/usr/include\"" "SYSTEM_HEADER_DIR=\"/include\"" diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index 40e9482ba1fb..cfff5645bfee 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, gmp }: +{ lib, stdenv, fetchpatch, fetchurl, patchelf, gmp }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in @@ -9,17 +9,31 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz.tgz"; - sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz"; + sha256 = "1lj51xg9p75qj1x5036lvjvd4a2j21kfi6vh8d0n9kdcdffvb73l"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz"; - sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; + sha256 = "0xndr2awlxdqr81j6snl9zqjx8r6f5fy9x65j1w899kf2dh9zsjv"; + }) + else if stdenv.hostPlatform.system == "aarch64-darwin" then + (fetchurl { + url = "https://projects.laas.fr/tina/software/mlton-${version}-1.arm64-darwin-21.6-gmp-static.tgz"; + sha256 = "1s61ayk3yj2xw8ilqk3fhb03x5x1wcakkmbhhvcsfb2hdw2c932x"; }) else throw "Architecture not supported"; + patches = [ + (fetchpatch { + name = "remove-duplicate-if.patch"; + url = "https://github.com/MLton/mlton/commit/22002cd0a53a1ab84491d74cb8dc6a4e50c1f7b7.patch"; + decode = "sed -e 's|Makefile\.binary|Makefile|g'"; + hash = "sha256-Gtmc+OIh+m7ordSn74fpOKVDQDtYyLHe6Le2snNCBYQ="; + }) + ]; + buildInputs = [ gmp ]; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index d2704a4093d0..a74d1d85455b 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,14 +15,14 @@ rec { mlton20210117Binary = callPackage ./20210117-binary.nix { }; mlton20210117 = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "20210117"; rev = "on-20210117-release"; sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM="; }; mltonHEAD = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "HEAD"; rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5"; sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A="; diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index 1e4c0aacfc3c..afb11847adb6 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -11,5 +11,5 @@ homepage = "http://mlton.org/"; license = "bsd"; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; } diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3e925417d644..41c4a36ec2ee 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-10-17"; + version = "unstable-2024-12-04"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b8eb82f8bc907b42dfb463cab62e49fbe2fff997.tar.gz"; - sha256 = "1fxqigr002ssgz1l62rc7k04q4q0hwcl2wqy7l2shylxqf7yfcd6"; + url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz"; + sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d51851b2c471..e63f422c123a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124461,7 +124461,7 @@ self: { "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers + , haskell-gi-overloading, libsoup_2_4, text, transformers }: mkDerivation { pname = "gi-soup"; @@ -124474,15 +124474,15 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libsoup ]; + libraryPkgconfigDepends = [ libsoup_2_4 ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_2_4;}; "gi-soup_3_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers + , haskell-gi-overloading, libsoup_3, text, transformers }: mkDerivation { pname = "gi-soup"; @@ -124495,11 +124495,11 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libsoup ]; + libraryPkgconfigDepends = [ libsoup_3 ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_3;}; "gi-vips" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -227267,33 +227267,18 @@ self: { }) {}; "opencascade-hs" = callPackage - ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKDEGLTF, TKDEOBJ - , TKDESTEP, TKDESTL, TKernel, TKFillet, TKG2d, TKG3d, TKGeomBase - , TKLCAF, TKMath, TKMesh, TKOffset, TKPrim, TKRWMesh, TKService - , TKShHealing, TKStd, TKTopAlgo, TKV3d, TKXCAF, TKXSBase - }: + ({ mkDerivation, base, opencascade-occt, resourcet }: mkDerivation { pname = "opencascade-hs"; version = "0.4.0.0"; sha256 = "1dhasjjhcg54qihcihid69z70l75dn7xsbsd765lsgzc35m1qbrl"; libraryHaskellDepends = [ base resourcet ]; - librarySystemDepends = [ - TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet - TKG2d TKG3d TKGeomBase TKLCAF TKMath TKMesh TKOffset TKPrim - TKRWMesh TKService TKShHealing TKStd TKTopAlgo TKV3d TKXCAF - TKXSBase - ]; + librarySystemDepends = [ opencascade-occt ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {TKBO = null; TKBRep = null; TKDEGLTF = null; TKDEOBJ = null; - TKDESTEP = null; TKDESTL = null; TKFillet = null; TKG2d = null; - TKG3d = null; TKGeomBase = null; TKLCAF = null; TKMath = null; - TKMesh = null; TKOffset = null; TKPrim = null; TKRWMesh = null; - TKService = null; TKShHealing = null; TKStd = null; - TKTopAlgo = null; TKV3d = null; TKXCAF = null; TKXSBase = null; - TKernel = null;}; + }) {inherit (pkgs) opencascade-occt;}; "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers @@ -289360,8 +289345,8 @@ self: { "spike" = callPackage ({ mkDerivation, base, containers, directory, filepath, glib - , global-variables, gtk, libsoup, mtl, process, random, rosezipper - , stm, webkit + , global-variables, gtk, libsoup_2_4, mtl, process, random + , rosezipper, stm, webkit }: mkDerivation { pname = "spike"; @@ -289373,12 +289358,12 @@ self: { base containers directory filepath glib global-variables gtk mtl process random rosezipper stm webkit ]; - executablePkgconfigDepends = [ libsoup ]; + executablePkgconfigDepends = [ libsoup_2_4 ]; description = "Experimental web browser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "spike"; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_2_4;}; "spine" = callPackage ({ mkDerivation, base }: diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 20c7c0c145ef..cde97c4049d9 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -306,12 +306,28 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { mingw-patch = fetchgit { name = "mingw-python-patches"; url = "https://src.fedoraproject.org/rpms/mingw-python3.git"; - rev = "45c45833ab9e5480ad0ae00778a05ebf35812ed4"; # for python 3.11.5 at the time of writing. - sha256 = "sha256-KIyNvO6MlYTrmSy9V/DbzXm5OsIuyT/BEpuo7Umm9DI="; + rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing. + hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY="; }; - in [ - "${mingw-patch}/*.patch" - ]); + in ( + builtins.map (f: "${mingw-patch}/${f}") + [ + # The other patches in that repo are already applied to 3.11.10 + "mingw-python3_distutils.patch" + "mingw-python3_frozenmain.patch" + "mingw-python3_make-sysconfigdata.py-relocatable.patch" + "mingw-python3_mods-failed.patch" + "mingw-python3_module-select.patch" + "mingw-python3_module-socket.patch" + "mingw-python3_modules.patch" + "mingw-python3_platform-mingw.patch" + "mingw-python3_posix-layout.patch" + "mingw-python3_pthread_threadid.patch" + "mingw-python3_pythonw.patch" + "mingw-python3_setenv.patch" + "mingw-python3_win-modules.patch" + ]) + ); postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index abed1fe0a685..5b09e4bf97b3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -46,10 +46,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "20"; + patch = "21"; suffix = ""; }; - hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; + hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E="; inherit passthruFun; }; @@ -58,10 +58,10 @@ in { sourceVersion = { major = "3"; minor = "10"; - patch = "15"; + patch = "16"; suffix = ""; }; - hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; + hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix deleted file mode 100644 index c82d232e11a4..000000000000 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeFontsConf, - cacert, - cairo, - coreutils, - fontconfig, - freefont_ttf, - glib, - gmp, - gtk3, - libedit, - libffi, - libiconv, - libGL, - libGLU, - libjpeg, - libpng, - libtool, - mpfr, - openssl, - pango, - poppler, - readline, - sqlite, - disableDocs ? false, - CoreFoundation, - gsettings-desktop-schemas, - wrapGAppsHook3, -}: - -let - - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - - libPath = lib.makeLibraryPath [ - cairo - fontconfig - glib - gmp - gtk3 - gsettings-desktop-schemas - libedit - libGL - libGLU - libjpeg - libpng - mpfr - openssl - pango - poppler - readline - sqlite - ]; -in - -stdenv.mkDerivation rec { - pname = "racket"; - version = "7.9"; # always change at once with ./minimal.nix - - src = - (lib.makeOverridable ( - { name, sha256 }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit sha256; - } - )) - { - name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; - }; - - FONTCONFIG_FILE = fontsConf; - LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") - ]; - - nativeBuildInputs = [ - cacert - wrapGAppsHook3 - ]; - - buildInputs = - [ - fontconfig - libffi - libtool - sqlite - gsettings-desktop-schemas - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreFoundation - ]; - - preConfigure = '' - unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname - done - mkdir src/build - cd src/build - - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) - ''; - - shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; - configureFlags = - [ - "--enable-${shared}" - "--enable-lt=${libtool}/bin/libtool" - ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; - - configureScript = "../configure"; - - enableParallelBuilding = false; - - meta = with lib; { - description = "Programmable programming language"; - longDescription = '' - Racket is a full-spectrum programming language. It goes beyond - Lisp and Scheme with dialects that support objects, types, - laziness, and more. Racket enables programmers to link - components written in different dialects, and it empowers - programmers to create new, project-specific dialects. Racket's - libraries support applications from web servers and databases to - GUIs and charts. - ''; - homepage = "https://racket-lang.org/"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ ]; - platforms = [ - "x86_64-darwin" - "x86_64-linux" - "aarch64-linux" - ]; - broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path - }; -} diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix deleted file mode 100644 index 32e1f39965d7..000000000000 --- a/pkgs/development/libraries/geos/3.11.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, callPackage -, fetchpatch -, fetchurl -, testers - -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "geos"; - version = "3.11.4"; - - src = fetchurl { - url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; - hash = "sha256-NkyIzPw4qlDPZccA57KuRwbtEDMmEoST2/dQx40TbSw="; - }; - - patches = [ - # Pull upstream fix of `gcc-13` build failure: - # https://github.com/libgeos/geos/pull/805 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; - hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" - ]; - - doCheck = true; - - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; - }; - - meta = with lib; { - description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; - homepage = "https://libgeos.org"; - license = licenses.lgpl21Only; - maintainers = teams.geospatial.members; - pkgConfigModules = [ "geos" ]; - mainProgram = "geosop"; - }; -}) diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7f58b4d11ce3..8ba7c0483dc6 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup_2_4, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { glib gsignond json-glib - libsoup + libsoup_2_4 ]; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 06999b225de1..0261c39a8740 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check -, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, json-glib, libsoup_2_4, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { gnutls gsignond json-glib - libsoup + libsoup_2_4 ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index a838efc15a70..d3ecb8913947 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -9,7 +9,7 @@ , vala , gi-docgen , python3 -, libsoup +, libsoup_2_4 , glib , gnome , gssdp-tools @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 5fa0df314274..4835047a3edd 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -13,7 +13,7 @@ , docbook_xml_dtd_45 , glib , gssdp -, libsoup +, libsoup_2_4 , libxml2 , libuuid , gnome @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gssdp - libsoup + libsoup_2_4 libxml2 ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index c6de97101be8..d2ac5a83602a 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc -, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages +, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup_2_4, gnome, buildPackages , Foundation, AppKit }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 - libsoup + libsoup_2_4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index de0ff52f1e1b..22e530959105 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , glib -, libsoup +, libsoup_2_4 , libxml2 , gobject-introspection , gtk-doc @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - libsoup + libsoup_2_4 libxml2 ]; diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index eefac702d7ef..38a6f2324ff7 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { pname = "cairo2"; - version = "0.6.4"; + version = "0.6.5"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU="; + sha256 = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I="; }; minimalOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/sel/default.nix b/pkgs/development/ocaml-modules/sel/default.nix index e9742c9b42d5..e5fdccbc7a3f 100644 --- a/pkgs/development/ocaml-modules/sel/default.nix +++ b/pkgs/development/ocaml-modules/sel/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "sel"; - version = "0.4.0"; + version = "0.5.0"; minimalOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz"; - hash = "sha256-Sp0eSeKyFmMvOQrebqLKP+HbHQB0D0eAmEjDzxnFL1I="; + hash = "sha256-n4Z+Pe9fkHLnRzwCryxYNe165Q2Vds9+CduRbRJjqI0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 461fe2c4ff43..c682fde87681 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "27.0.1"; + version = "28.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; + hash = "sha256-vMqDxg2BV9/g5FquejnT/Rsvwjhdh01K2LxiT355p1U="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 02740ccaae7a..42d9511e216e 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.17"; + version = "0.6.18"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-TxYmj5OS9x50QxAOwsFMbM15bhrHTmBTEsRlFoG3Kyc="; + hash = "sha256-/iSL+Beny7q9RtdbVIfiMmAwH5wS90ADQszBL7Ooq3o="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index d53f571a0011..b1db4644a133 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.38"; + version = "0.9.42"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-Qc972Pl+XdgWukgEpTBhsidPvbcPPPWOkqQk24x2ugo="; + hash = "sha256-4UN96ZpXssCsYh/UmCaPud+bqgw9ckqofyifvIohBBk="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index b0d50295a8aa..3a9874f037c6 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.3"; + version = "6.4"; pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; + hash = "sha256-qA1fhqNJbhSOvsPSgbnuRTs40OJsn7tYHWzujN2RVK8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 54c5ad8fd37b..33c501910019 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.9"; + version = "0.2.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BjjC8pvvQfnvaExhei+F4a2eryHiRbI527BZFLpJk2w="; + hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix index 55059da486a0..84c504bed8ca 100644 --- a/pkgs/development/python-modules/autoslot/default.nix +++ b/pkgs/development/python-modules/autoslot/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "autoslot"; - version = "2022.12.1"; - format = "pyproject"; + version = "2024.12.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,16 +18,10 @@ buildPythonPackage rec { owner = "cjrh"; repo = "autoslot"; rev = "refs/tags/v${version}"; - hash = "sha256-fG4rRwRubJt2aXChEsMybEKal6LscZI7GA2uwtK5Vtg="; + hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'requires = ["flit"]' 'requires = ["flit_core"]' \ - --replace 'build-backend = "flit.buildapi"' 'build-backend = "flit_core.buildapi"' - ''; - - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 2007e304f3ab..f8beaa1bb742 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, - pythonOlder, setuptools, }: @@ -15,8 +13,6 @@ buildPythonPackage rec { version = "9.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; hash = "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; @@ -29,22 +25,22 @@ buildPythonPackage rec { azure-common azure-mgmt-core msrest - msrestazure ]; # no tests included doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ - "azure.common" "azure.mgmt.hdinsight" ]; - meta = with lib; { + meta = { description = "Microsoft Azure HDInsight Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 1606e56cccdc..417528219abf 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -3,18 +3,15 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, azure-common, azure-mgmt-core, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-servicebus"; version = "8.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,9 +19,10 @@ buildPythonPackage rec { hash = "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest - msrestazure azure-common azure-mgmt-core ]; @@ -32,10 +30,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - meta = with lib; { + pythonNamespaces = [ "azure.mgmt" ]; + + pythonImportsCheck = [ "azure.mgmt.servicebus" ]; + + meta = { description = "This is the Microsoft Azure Service Bus Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ maxwilson ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxwilson ]; }; } diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index a3a131c8b8af..dc8e0d851efa 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,33 +1,86 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, + colorlog, + fetchFromGitHub, + jinja2, + mock, + pdm-backend, + pylibmc, + pystache, + pytest-cov-stub, + pytestCheckHook, pythonOlder, + pyyaml, + redis, + requests, + tabulate, + watchdog, }: buildPythonPackage rec { pname = "cement"; - version = "3.0.10"; - format = "setuptools"; + version = "3.0.12"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU="; + src = fetchFromGitHub { + owner = "datafolklabs"; + repo = "cement"; + rev = "refs/tags/${version}"; + hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI="; }; - # Disable test tests since they depend on a memcached server running on - # 127.0.0.1:11211. - doCheck = false; + build-system = [ pdm-backend ]; + + optional-dependencies = { + colorlog = [ colorlog ]; + jinja2 = [ jinja2 ]; + mustache = [ pystache ]; + generate = [ pyyaml ]; + redis = [ redis ]; + memcached = [ pylibmc ]; + tabulate = [ tabulate ]; + watchdog = [ watchdog ]; + yaml = [ pyyaml ]; + cli = [ + jinja2 + pyyaml + ]; + }; + + nativeCheckInputs = [ + mock + pytest-cov-stub + pytestCheckHook + requests + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cement" ]; + # Tests are failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; + + disabledTests = [ + # Test only works with the source from PyPI + "test_get_version" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/ext/test_ext_memcached.py" + "tests/ext/test_ext_redis.py" + "tests/ext/test_ext_smtp.py" + ]; + meta = with lib; { description = "CLI Application Framework for Python"; - mainProgram = "cement"; homepage = "https://builtoncement.com/"; + changelog = "https://github.com/datafolklabs/cement/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ eqyiel ]; + mainProgram = "cement"; }; } diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index f562bbcaf709..5bb9c0cbffe6 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.18"; + version = "0.5.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,13 +61,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs="; + hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w="; + hash = "sha256-vHH7Uq4Jf8/5Vc8oZ5nvAeq/dFVWywsQYbp7yJkfX7Q="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 039880f363dd..06a42d63887c 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.30.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60="; + hash = "sha256-M6JoBVst2aJwxr/SyMpXXOnMKIl9gX0ltg3H0SpU7uQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index fb3a138627ad..5f28ef159c4d 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -7,13 +7,14 @@ pyopenssl, pytest-mock, pytestCheckHook, - pythonAtLeast, pyvmomi, qemu, requests, + distutils, setuptools, stdenv, verboselogs, + versioneer, }: buildPythonPackage rec { @@ -26,8 +27,14 @@ buildPythonPackage rec { hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; }; + build-system = [ + setuptools + versioneer + ]; + propagatedBuildInputs = [ colorlog + distutils pyvmomi requests verboselogs @@ -46,6 +53,7 @@ buildPythonPackage rec { # argparse is part of the standardlib substituteInPlace setup.py \ --replace "'argparse'," "" + rm versioneer.py ''; disabledTests = [ @@ -84,6 +92,5 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ evanjs ]; - broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index c61c0566c163..1df8ee11bf65 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -34,16 +34,15 @@ python-dateutil, # duecredit duecredit, - # python>=3.8 distro, # win colorama, # python-version-dependent pythonOlder, - importlib-resources, importlib-metadata, typing-extensions, # tests + pytest-xdist, pytestCheckHook, p7zip, curl, @@ -52,13 +51,14 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.3"; + version = "1.1.4"; + pyproject = true; src = fetchFromGitHub { owner = "datalad"; - repo = pname; + repo = "datalad"; rev = "refs/tags/${version}"; - hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc="; + hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; postPatch = '' @@ -79,49 +79,44 @@ buildPythonPackage rec { ]; dependencies = - [ - # core - platformdirs - chardet - iso8601 - humanize - fasteners - packaging - patool - tqdm - annexremote - looseversion - setuptools - git-annex + optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish; - # downloaders-extra - # requests-ftp # not in nixpkgs yet - - # downloaders + optional-dependencies = { + core = + [ + platformdirs + chardet + distro + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + looseversion + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + downloaders = [ boto3 keyrings-alt keyring msgpack requests - - # publish - python-gitlab - - # misc + ]; + downloaders-extra = [ + # requests-ftp # not in nixpkgs yet + ]; + publish = [ python-gitlab ]; + misc = [ argcomplete pyperclip python-dateutil - - # duecredit - duecredit - - # python>=3.8 - distro - ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; + duecredit = [ duecredit ]; + }; postInstall = '' installShellCompletion --cmd datalad \ @@ -228,6 +223,7 @@ buildPythonPackage rec { nativeCheckInputs = [ p7zip + pytest-xdist pytestCheckHook git-annex curl diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index d2d65daa6689..5cce017a0833 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, psycopg2, python, - pythonOlder, pytz, setuptools-scm, tablib, @@ -15,23 +14,20 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.1.1"; + version = "4.3.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak="; + hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc="; }; pythonRelaxDeps = [ "tablib" ]; build-system = [ setuptools-scm ]; - dependencies = [ diff-match-patch django diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 9b955fcfff7e..536cd80f5db1 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs"; inherit version; - hash = "sha256-hhKMIotl5smoXl3FbrHG9BElkX2uDiHmz+zfGyfmMMU="; + hash = "sha256-Em01S73/SQbE6T5jYRl/b7+2Ixw99t74Wikdrm+fV3s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 3e79caf80134..edc12e795973 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -118,7 +118,10 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = + !stdenv.hostPlatform.isDarwin + # pywatchman depends on folly which does not support 32bits + && !stdenv.hostPlatform.is32bit; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 01393258dbef..2dcaf0600b79 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -114,7 +114,10 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = + !stdenv.hostPlatform.isDarwin + # pywatchman depends on folly which does not support 32bits + && !stdenv.hostPlatform.is32bit; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 28a8b717d4f8..e0497ad48c38 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.25"; + version = "1.0.26"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; - rev = "refs/tags/${version}"; - hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY="; + tag = version; + hash = "sha256-CKBgBs0hLTvExkcGYtOZ+h+/Hh4HEgF9wT/jzRe0bV0="; }; build-system = [ diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index e5f44feb69c5..715aa1f8c3a4 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -3,8 +3,10 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, absl-py, flax, + jax, jaxlib, jmp, numpy, @@ -25,14 +27,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.12"; - format = "setuptools"; + version = "0.0.13"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; + hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs="; }; patches = [ @@ -44,15 +46,24 @@ let }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py - flax - jaxlib + jaxlib # implicit runtime dependency jmp numpy tabulate ]; + optional-dependencies = { + jax = [ + jax + jaxlib + ]; + flax = [ flax ]; + }; + pythonImportsCheck = [ "haiku" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 2167c3e1abdd..a9e5790fcf4f 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -11,11 +11,12 @@ pythonOlder, setuptools, toolz, + mypy, }: buildPythonPackage rec { pname = "eth-utils"; - version = "4.0.0"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-utils"; rev = "v${version}"; - hash = "sha256-k2pHM1eKPzoGxZlU6yT7bZMv4CCWGaZaSnFHSbT76Zo="; + hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4="; }; nativeBuildInputs = [ setuptools ]; @@ -36,19 +37,18 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis pytestCheckHook + mypy ] ++ eth-hash.optional-dependencies.pycryptodome; - # Removing a poorly written test case from test suite. - # TODO work with the upstream - disabledTestPaths = [ "tests/functional-utils/test_type_inference.py" ]; - pythonImportsCheck = [ "eth_utils" ]; - meta = { + disabledTests = [ "test_install_local_wheel" ]; + + meta = with lib; { changelog = "https://github.com/ethereum/eth-utils/blob/${src.rev}/docs/release_notes.rst"; description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; - license = lib.licenses.mit; - maintainers = [ ]; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; }; } diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 3adf0ad601ae..d65c75556af4 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.22"; + version = "1.7.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-llD7hDZStgCUfp06byGLtLPgDqiK7BAMw9kLNzOGUec="; + hash = "sha256-YsZBPcGWKxE5Cl3HCmB2ZDecFuQa5Q5aTEbZ5ijmB24="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index d24794e0d17d..7e1cc1c7f737 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.48.0"; + version = "3.49.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-NYDmDhsgYNMZZDiSZ5ZtRauTzzckjqtETbfs8OvkgE4="; + hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 28c9a5aa3d25..88d51e88c33e 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.4.0"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = "gsd"; rev = "refs/tags/v${version}"; - hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk="; + hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE="; }; build-system = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8f36797f2619..63a93a7ed5b7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.11.8"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-fDHt9D2Lr3yVLhWYar4ANeq3W4A1lhAxSLTjWqJzJNE="; + hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI="; }; __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.1.0" "setuptools" \ + --replace-fail "setuptools==75.6.0" "setuptools" \ ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index bfe31c016bc3..cda1aa486143 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.83.0"; + version = "0.86.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; + hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 4831f14335c0..0687b65e297f 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -69,6 +69,12 @@ buildPythonPackage rec { "hvplot/tests/testutil.py" ]; + # need to set MPLBACKEND=agg for headless matplotlib for darwin + # https://github.com/matplotlib/matplotlib/issues/26292 + preCheck = '' + export MPLBACKEND=agg + ''; + pythonImportsCheck = [ "hvplot.pandas" ]; meta = { diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix index 7ca8930f4fc4..85e9742c98db 100644 --- a/pkgs/development/python-modules/id/default.nix +++ b/pkgs/development/python-modules/id/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, flit-core, pretend, - pydantic, pytestCheckHook, pythonOlder, requests, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "id"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,15 +20,12 @@ buildPythonPackage rec { owner = "di"; repo = "id"; rev = "refs/tags/v${version}"; - hash = "sha256-lmUBy0hJAxfF65RcBP7tTizrg8j2Zypu4sKgOUQCYh8="; + hash = "sha256-6Vkbs/i1roAtPGwLxdM+XKDrMTo0+NfVpAUpw6GPg9U="; }; build-system = [ flit-core ]; - dependencies = [ - pydantic - requests - ]; + dependencies = [ requests ]; nativeCheckInputs = [ pretend diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 1d07533f536a..29cb68253625 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -4,30 +4,27 @@ fetchFromGitHub, setuptools, swig, - wheel, msgpack, pytestCheckHook, }: buildPythonPackage rec { pname = "ihm"; - version = "1.7"; + version = "1.8"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo="; + hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30="; }; - nativeBuildInputs = [ - setuptools - swig - wheel - ]; + nativeBuildInputs = [ swig ]; - propagatedBuildInputs = [ msgpack ]; + build-system = [ setuptools ]; + + dependencies = [ msgpack ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index b501fa5927c4..94191dd86a07 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "itemadapter"; - version = "0.9.0"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-5PlYpra29YMfogc3MBADGgvX7QQp3dCbUZecARR1yv0="; + hash = "sha256-JlXIxQ8ahAXJ+nS4zcTaf+xUHKIXvIIbkKzIRRyYqdI="; }; + build-system = [ setuptools ]; + # Infinite recursion with Scrapy doCheck = false; diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix index bcdc986033e8..82e4c4985ca1 100644 --- a/pkgs/development/python-modules/knocki/default.nix +++ b/pkgs/development/python-modules/knocki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "knocki"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "swan-solutions"; repo = "knocki-homeassistant"; - rev = "refs/tags/v${version}"; - hash = "sha256-Eh/ykTbR2NMZ9Mjgcc53OU3+2EsX6FWV93DmwCDvsRg="; + tag = "v${version}"; + hash = "sha256-85w+fj00VW0miNt+xRMcU6szg/Z7QaeKLGw2BV7X0T4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 46fd51edf6ab..7b1c27e4c9ff 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, defang, dnspython, + eval-type-backport, fetchFromGitHub, playwrightcapture, poetry-core, @@ -11,13 +12,12 @@ pythonOlder, redis, requests, - sphinx, ua-parser, }: buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.5"; + version = "1.12.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-iozCgQ7VULQVlKaHmThxiFDZ2hly2yYMdIrXBFHFRfI="; + hash = "sha256-KiYpPgwMsIuIDUjQfw83ATiE5VI2XMaxGsnP5xEypqc="; }; pythonRelaxDeps = [ @@ -37,18 +37,21 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - - dependencies = [ - async-timeout - defang - dnspython - playwrightcapture - pydantic - redis - requests - sphinx - ua-parser - ]; + dependencies = + [ + defang + dnspython + playwrightcapture + pydantic + redis + requests + ua-parser + ] + ++ playwrightcapture.optional-dependencies.recaptcha + ++ redis.optional-dependencies.hiredis + ++ ua-parser.optional-dependencies.regex + ++ lib.optionals (pythonOlder "3.11") [ async-timeout ] + ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 83c78c9bbc07..12a731af5f30 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.137"; + version = "0.1.147"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ="; + hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 0b5d85130e7a..28c9d3cfda69 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pydgUTdCHsa2Je8wfiTvK0WmXUez5JY1GNPLNAzRwtc="; + hash = "sha256-Sm3WHZdCpz0F/tpGQc7tvpjcxfPc2cMAyc0rVjm6i04="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 1da515654a97..4a7322a5c9a7 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.4"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; + hash = "sha256-ISAPb91G4IRV00sTb2Rc5rjDgA4K4T2Ad5Excakh2lo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 4835a3240510..65dc94f89abe 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-gONAjZcSG+vKP6P/0UtRKFhwwcPHPU7gTT0Yz+YEBGY="; + hash = "sha256-MdJnXb2ESJdW3QYqf/7TMLKr3KO3cV1RFnT1tQdeTdY="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index d3229e4de03c..f590810b4b91 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc="; + hash = "sha256-1qsgE1mWKoo0Norto6Sbu+Z+ngCcWb2SXE+yvkrOOQY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index ca094727e083..8661014d1e02 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.23"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-DMdU8LT1IGTHM8EsCX44MvGv+luOsKnPSI7yRR5ULPo="; + hash = "sha256-Zt97JZHp0MsHFtdrx6Xjqhz/jREWwevGSz8u9l5t8oI="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index e16484b78d7e..2d1a6281b7cc 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-lVW12tWDqNQW+mijxcF98aOuNw006xTdv0Cm+yZ4H0o="; + hash = "sha256-vytKBvvNVbW1GpFS9+0ydkyUqih3UUGusRIp79hMjtI="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index 060b3f562c49..b8925cf0d1a5 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8="; + hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 935590283d85..0bff93ac2d06 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s="; + hash = "sha256-zo+LMLKc/4VAGrohGChftj+4FHpWtlbuIPfoUQyghaI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index 3f309d4ec12d..4fadcd0e8beb 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,9 +18,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA="; + hash = "sha256-6+czVEcPi2Bh1flhse5QcW1Uly7ylfslPj68OT1bNss="; }; + pythonRelaxDeps = [ "ollama" ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 24d78be21ef9..b6f470614e6d 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.2.5"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug="; + hash = "sha256-o31bpcyUejajzqpB38ZdcmqHP/s6J7e0lZKE9blE9hc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index 65be86795ec7..9ebcbc778c63 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4="; + hash = "sha256-inkIF4LFaI8+zWa6jHK8TU+l19LiyUsbzzDTZTen0jY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 9b16410ab4f4..17751e8aba9c 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.3.5"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY="; + hash = "sha256-XJQJaUCAvIAmLnyFuo81upmm9iMOD08iHm0/HZMHR1M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index 81592cb086e7..741ce168bfdd 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-0dT1T5DJEXBvCilwf4YZVZ2H43piI6xkpUGGpKu8GsY="; + hash = "sha256-RWrFrV35djxEF9Nfh5Fz5VxQA7Jon7cmxDJXigx2dmQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 7445ff6453ae..98ab38e96010 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.4.0"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-++v/eHaiGbarlokq58QyqSmRlfq49n1KSg6/baIQskI="; + hash = "sha256-8J5BgsvCor11roXOuxaBB1JH8NkbkxsJTKxDFThs6Ho="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 106005841f1e..029a2d5d9275 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.3.6"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-EoTvA98XH+/ulJ+NdenRzjo4Fy+ZAmmjjzkyj1qT6kc="; + hash = "sha256-MkLlJtsh3/TnuwQzAhN2BklrSQ8GOcJoDcwok9QWJw8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index fd6b916bec0a..f29fc7e2fc93 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw="; + hash = "sha256-Ah6D1kJAtGWH8i5XxgxTHe004Y12nIebTupIHIjJez0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 3ac980fd6ac3..7460e068e619 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.16"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo="; + hash = "sha256-ikQ6Vk59EneanwMMuC/jJDgD4hfXJBB2SsEW3UNVT+U="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 333780fc2f68..abee95a3ab98 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI="; + hash = "sha256-cemDx3ccOQiOQFjNeAKSGTFaD7YxueErkD5TJDuaP9Y="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index 62b9f6c2527f..c2f57b35edab 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.2.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ="; + hash = "sha256-YDmmzb/2LGOIwH6CoVf+Lt07vvDFrfKSrYVGv07HW4I="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index 7f7615953bba..38b6e5dc8568 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_question_gen_openai"; inherit version; - hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4="; + hash = "sha256-79O0aCMoCOnTR0ZwquqwDkG5D3X1LQyb+/ESB+CWPWI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index b77afe7b8dda..45318049796f 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0="; + hash = "sha256-AL5KoDBKKvN6rlXyvIEY1Dh0j6DyFLgSaWEk3nh6kRY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 1c040bd03e7b..a8d452f6e207 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-bGdfzS8FmaEx+J4cXtNSHd4xM4qbckp3IfXf1yQ+qNg="; + hash = "sha256-eCjewf63xT5tMUA4X4SZwOesdGJlKZOEcU3f0WP50Vo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 0fcc1da35ef2..f16f736469c2 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU="; + hash = "sha256-mS8nEK8LV1wVh0wV7W8EujLH7QcPagHI4P5cT0bHAJ4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index b9a879047a54..d06fd69723ec 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-pf6toIlXFNzEHWXdUSwcOM9w2K4ZlHz/grgNWOaqNn4="; + hash = "sha256-6Z7Fb0+FRtf9oafBriYWL7mst+vKw0O1q9tCNLRkTg8="; }; pythonRelaxDeps = [ "llama-parse" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 1aab269de7c5..f7cf53876802 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-gTseRAdHZW2jzewN3rRC6B8yCgMu8H7Y3N6ZdH1D1nI="; + hash = "sha256-oCXpLZyIrZKNNDg8hkEh5xxXEqz7B1hLjE5OUwEIozg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 51bc5d549976..6cc9844dcbc3 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-twitter"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_twitter"; inherit version; - hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o="; + hash = "sha256-I7xZQj/Kpwl6D0ltNuKI7TYoQVD9lBiM6I63C23hCwY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 6cf4a9fb87f4..4024b1c33f95 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98="; + hash = "sha256-N5FiwVZ+KWEQlcfVqHVcHJHzRb6Ct+iR2Dc+Wee7y+M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 1eee073053bd..225cfb6c75b7 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg="; + hash = "sha256-oGk2M/YaVm8pY4JDFOWGkKbDhEfd/OYBgWLSzV3peAQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index ab6183c410d9..a4d902789899 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-VAWSFqI71r0dw69MWYbbOLKTNYawQujuEmOF16XeziM="; + hash = "sha256-xel5WR0JrckfCbCPsfUj08/jDu488T5T2ihUDK6nNmo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index aea4617dc992..ca7b63b1c078 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4="; + hash = "sha256-6l4MFO7h5xJexN3Sf78F+OgzaKHNWxOffQvkqRhXEJw="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 517aeb8fa773..bd0a8bf5f56a 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.2.6"; + version = "0.3.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-x6KOZMZ5W8F8FATH3ZAwAeyrZ/rvjzrEooaFgQsSATQ="; + hash = "sha256-Ny1hKQUwrzvb/GI2WRa80i0EsE92oqSEdj6hFBle6H8="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 92fe05098613..6f7b1003892b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs="; + hash = "sha256-hv6cxCSKNtjUfZYNk2oxrJi10wAL4kxZeTx3v1ejlKc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3d135bd357f0..02755b8ed342 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -30,13 +30,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.9.14"; + version = "0.9.27"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs="; + hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 6e0b46f058eb..c52166ac7b72 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -70,14 +70,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; rev = "refs/tags/v${version}"; - hash = "sha256-s3t6RAJh129d5XJKtMNxS0wgGO4mKbAfMCXDBXEKBxM="; + hash = "sha256-etfgdSf3pbcKtCOk9MOgcR+Tzg4cmLbdadAOtQqN4PM="; }; # Remove currently broken dependency `shap`, a model explainability package. diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e2b1c53c9607..16d1e163da33 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.74" - "sha256-HmYmu4JNqjFaFLVif0aEbV5T9Wq8SYDNtm49S0lQyCo="; + buildMypyBoto3Package "s3" "1.35.76" + "sha256-bPHwNJhf5hB1TD5u8odJBimHDVCK2hO31h57mq60YQg="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.73" diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix index 48ac9a55aedc..da2282506af1 100644 --- a/pkgs/development/python-modules/openrgb-python/default.nix +++ b/pkgs/development/python-modules/openrgb-python/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openrgb-python"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc="; + hash = "sha256-XQnxYfs7VouABBNBg7mXT3XGfbEP3PNZzVO8TlTpSUc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 02485462a8b1..2bdef53e1ff6 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.23.0"; + version = "1.23.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; + hash = "sha256-GJp1ukrYxEEwmkge31b02ROWZW5V23TtoEUjhycHpSg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index aeae266c62b0..677b7f7a3c71 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.9.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-CgO88I2M8RGpYyJchXZtqxIBjNaULSqnDgfFCUQDFUw="; + hash = "sha256-+zlc23NRTDtPRaRnnvlf0tb3kkk+0TYPxACBUR/JWvw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index fdd93de663bf..d9562f0dd1f3 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.7.0"; + version = "3.7.4"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1evqG/rdHBs0bAHM+bIHyT4tFE6tAE+aJyu5r0QqAMk="; + hash = "sha256-43ySHV2Idssd5YonzhyIpet98vinpQ4O2AKUiAlYahY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index a7fbf07ef01b..d52f3f8c5348 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241205"; + version = "1.0.2.20241207"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg="; + hash = "sha256-K21wB0sAiG0wmOftX466jD0fPCQp647K+YNiWVSW3gQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 329061f5c082..3ed87e9cc77a 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.10.7" +version = "0.10.8" dependencies = [ "pyo3", "yrs", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 701616a3922a..553393f3a1d6 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.7"; + version = "0.10.8"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/${version}"; - hash = "sha256-Yb8ZFfJ/chF6+DUq7kLAxeRH9tuOCD2KiXxFG7ljQwg="; + tag = version; + hash = "sha256-5ukP2J9Mm7yRVXZ6x5VbArF5GDxQvRvOpKEwiySzPV8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix similarity index 73% rename from pkgs/development/python-modules/lmcloud/default.nix rename to pkgs/development/python-modules/pylamarzocco/default.nix index ce50a769ced9..7d01b6a74db3 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -1,21 +1,20 @@ { lib, - authlib, + aiohttp, + aioresponses, bleak, buildPythonPackage, fetchFromGitHub, - httpx, pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, syrupy, - websockets, }: buildPythonPackage rec { - pname = "lmcloud"; - version = "1.2.3"; + pname = "pylamarzocco"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,31 +22,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; - rev = "refs/tags/v.${version}"; - hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw="; + rev = "refs/tags/v${version}"; + hash = "sha256-sGjO1DuCYomYSWymtR4R49e1zwd0IM3WJwowoqvAApM="; }; build-system = [ setuptools ]; dependencies = [ - authlib + aiohttp bleak - httpx - websockets ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook syrupy ]; - pythonImportsCheck = [ "lmcloud" ]; + pythonImportsCheck = [ "pylamarzocco" ]; meta = with lib; { description = "Library to interface with La Marzocco's cloud"; homepage = "https://github.com/zweckj/pylamarzocco"; - changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v.${version}"; + changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 28dea568850e..d8bb004c3383 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.20"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; - rev = "refs/tags/v${version}"; - hash = "sha256-UIWubFLHtf43co/aYXh3rxkjLJ77E+Sgkx25UFC5vcg="; + tag = "v${version}"; + hash = "sha256-upgiGAAopRoCYtWaGpYIpmb8nbSHr1iW7wGfBrC1yW4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 72f6e8c8d485..6b52f646a78c 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -12,9 +12,6 @@ isodate, pyparsing, - # propagates <3.8 - importlib-metadata, - # extras: networkx networkx, @@ -24,31 +21,29 @@ # tests pip, pytest-cov-stub, - pytest7CheckHook, + pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "rdflib"; - version = "7.0.0"; - format = "pyproject"; + version = "7.1.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; - repo = pname; + repo = "rdflib"; rev = "refs/tags/${version}"; - hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; + hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - isodate - html5lib + dependencies = [ pyparsing - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.11") [ isodate ]; optional-dependencies = { html = [ html5lib ]; @@ -60,8 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pip pytest-cov-stub - # Failed: DID NOT WARN. No warnings of type (,) were emitted. - pytest7CheckHook + pytestCheckHook setuptools ] ++ optional-dependencies.networkx ++ optional-dependencies.html; diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix index f2b6f3d00b4c..4a5614afe4b8 100644 --- a/pkgs/development/python-modules/replicate/default.nix +++ b/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "replicate"; - version = "1.0.1"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "replicate"; repo = "replicate-python"; rev = "refs/tags/${version}"; - hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY="; + hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix index b75379c06af2..851bc66b3e12 100644 --- a/pkgs/development/python-modules/sarif-tools/default.nix +++ b/pkgs/development/python-modules/sarif-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sarif-tools"; - version = "3.0.2"; + version = "3.0.4"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "sarif-tools"; - rev = "refs/tags/v${version}"; - hash = "sha256-VGdl4WBdIiCWPGfFxqcG4XlbLh0uiLQXdrhUa2OxaVY="; + tag = "v${version}"; + hash = "sha256-Kb7kEntEdLOuIgBqeEolXirG8E1orzRz0vv8XK2oO3Y="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index 2a25488c1557..4ed82e24de1c 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, matplotlib, numpy, pandas, @@ -16,22 +15,19 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.9.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk="; + hash = "sha256-KrQqd3zChw9sxjbrTrxXInXAJLyXwPkhbPa9One6I+g="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pandas diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 7d1e431334bf..d4b29be0ffb4 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "securesystemslib"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "secure-systems-lab"; repo = "securesystemslib"; rev = "refs/tags/v${version}"; - hash = "sha256-PDivKunqQcGnER4eyWtGE5gvbqvhavXF7n/O2rTFTkI="; + hash = "sha256-HAYsmsW5GKLmfq9FVVsME+tE7Qg0jx9YIWw1UQWwV2c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index 9aafd726976e..f29379975ae9 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, pydantic, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "sigstore-rekor-types"; - version = "0.0.13"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "sigstore-rekor-types"; rev = "refs/tags/v${version}"; - hash = "sha256-vZNzNu0Ks0Xp/v406jVqPV9FuHgXORMa7NzmXeWoa+Q="; + hash = "sha256-mMjFmUjaYvfFCTAvhr4x8QJZSypGTkOmzP+OiVyyz5Y="; }; - build-system = [ flit-core ]; + build-system = [ setuptools ]; dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email; diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index 88ad6bb5d2f4..99b9674dbb7e 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "sigstore-python"; - version = "3.5.1"; + version = "3.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,9 +36,11 @@ buildPythonPackage rec { owner = "sigstore"; repo = "sigstore-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AMKe+R1sTXdxFAelJmRiEyDNe+T55KaGK3HUARqz3Tw="; + hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM="; }; + pythonRelaxDeps = [ "sigstore-rekor-types" ]; + build-system = [ flit-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f20779b9b6d4..f913ee43a2ff 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.12.3"; + version = "3.12.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "snowflakedb"; repo = "snowflake-connector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Rv4/zGoSBA3Pdu67d96sgZLgZae6yfpLsJzwsm2A690="; + hash = "sha256-6poMWKQB/NR40W39KDJwBgYGeAHsr4f1GJhPxYiTc1k="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index afbe62d9c989..1bd6de25631a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.7.1"; + version = "2.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0="; + hash = "sha256-2lF8iS8c7KXDdXT2IuApFnx0g4syWmIP1y25W5DkkJA="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 88f1bbe52a89..c2fb4e44e34a 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -4,28 +4,24 @@ fetchFromGitHub, googleapis-common-protos, protobuf, + setuptools, lib, }: buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.15.0"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4="; + hash = "sha256-MP5P4kFACT1guZVU3f9YrnKeQaUK0Tnu7edKRy4yvlM="; }; patches = [ ./build.patch ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=3.13,<4' 'protobuf>=3.13' - ''; - # Default build pulls in Bazel + extra deps, given the actual build # is literally three lines (see below) - replace it with custom build. preBuild = '' @@ -34,7 +30,9 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py googleapis-common-protos protobuf diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 5ad3e1fb4cda..f62cefdbbd9f 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -5,43 +5,41 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pycodestyle, + pytest-cov-stub, pyyaml, }: buildPythonPackage rec { pname = "tinydb"; - version = "4.8.0"; - disabled = pythonOlder "3.5"; - format = "pyproject"; + version = "4.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "msiemens"; - repo = pname; + repo = "tinydb"; rev = "refs/tags/v${version}"; - hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA="; + hash = "sha256-N/45XB7ZuZiq25v6DQx4K9NRVnBbUHPeiKKbxQ9YB3E="; }; - nativeBuildInputs = [ poetry-core ]; - - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov-append --cov-report term --cov tinydb" "" - ''; + build-system = [ + poetry-core + ]; nativeCheckInputs = [ pytestCheckHook - pycodestyle + pytest-cov-stub pyyaml ]; pythonImportsCheck = [ "tinydb" ]; - meta = with lib; { + meta = { description = "Lightweight document oriented database written in Python"; homepage = "https://tinydb.readthedocs.org/"; changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html"; - license = licenses.mit; - maintainers = with maintainers; [ marcus7070 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcus7070 ]; }; } diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 0a357801915c..81d9c74792be 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, linkFarm, fetchurl, buildPythonPackage, @@ -8,23 +7,21 @@ python, # nativeBuildInputs - pkg-config, - setuptools-rust, - rustPlatform, cargo, + pkg-config, + rustPlatform, rustc, + setuptools-rust, # buildInputs openssl, - libiconv, - Security, # dependencies huggingface-hub, - numpy, # tests datasets, + numpy, pytestCheckHook, requests, tiktoken, @@ -74,14 +71,14 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.20.3"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; - rev = "refs/tags/v${version}"; - hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU="; + tag = "v${version}"; + hash = "sha256-G65XiVlvJXOC9zqcVr9vWamUnpC0aa4kyYkE2v1K2iY="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -91,35 +88,32 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE="; + hash = "sha256-5cw63ydyhpMup2tOe/hpG2W6YZ+cvT75MJBkE5Wap4s="; }; sourceRoot = "${src.name}/bindings/python"; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ + cargo pkg-config - setuptools-rust rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook - cargo rustc + setuptools-rust ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; + buildInputs = [ + openssl + ]; dependencies = [ huggingface-hub - numpy ]; nativeCheckInputs = [ datasets + numpy pytestCheckHook requests tiktoken diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 6770e65194cc..958da44d4546 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2024.5"; + version = "2024.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; - rev = "refs/tags/${version}"; - hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk="; + tag = version; + hash = "sha256-Pf1OFWbulrJeoWSJdI2QQ/ETd5TV6m8uhvCoKsx0bx8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f00f7aa9474a..e9b312cf2c59 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -58,16 +59,25 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.46.3"; + version = "4.47.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; - rev = "refs/tags/v${version}"; - hash = "sha256-unQ1BypPv3fcFLCq4yoyat4pNy4ub5kgKfQRnfhuaGI="; + tag = "v${version}"; + hash = "sha256-TQQ+w+EH/KWLE7iaaAHGxfE74hCiLXcqlIr1TIBFGvo="; }; + # torch.distributed is not available on darwin + # Fix submitted upstream in https://github.com/huggingface/transformers/pull/35133 + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/transformers/pytorch_utils.py \ + --replace-fail \ + 'if is_torch_greater_or_equal("2.5"):' \ + 'if False:' + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/ua-parser-builtins/default.nix b/pkgs/development/python-modules/ua-parser-builtins/default.nix new file mode 100644 index 000000000000..c64326ea2148 --- /dev/null +++ b/pkgs/development/python-modules/ua-parser-builtins/default.nix @@ -0,0 +1,28 @@ +{ + buildPythonPackage, + hatchling, + pyyaml, + ua-parser, + versioningit, +}: + +buildPythonPackage rec { + pname = "ua-parser-builtins"; + inherit (ua-parser) version src; + pyproject = true; + + sourceRoot = "${src.name}/ua-parser-builtins"; + + postPatch = '' + # break dependency cycle and don't use git to determine version + substituteInPlace pyproject.toml \ + --replace-fail 'dependencies = ["ua-parser"]' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ + hatchling + pyyaml + versioningit + ]; +} diff --git a/pkgs/development/python-modules/ua-parser-rs/Cargo.lock b/pkgs/development/python-modules/ua-parser-rs/Cargo.lock new file mode 100644 index 000000000000..0aa5944462f8 --- /dev/null +++ b/pkgs/development/python-modules/ua-parser-rs/Cargo.lock @@ -0,0 +1,865 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "js-sys" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.167" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-filtered" +version = "0.2.0" +dependencies = [ + "aho-corasick", + "clap", + "criterion", + "itertools 0.13.0", + "regex", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "ua-parser" +version = "0.2.0" +dependencies = [ + "clap", + "regex", + "regex-filtered", + "serde", + "serde_json", + "serde_yaml", +] + +[[package]] +name = "ua-parser-rs" +version = "0.1.2" +dependencies = [ + "pyo3", + "ua-parser", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" + +[[package]] +name = "web-sys" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/ua-parser-rs/default.nix b/pkgs/development/python-modules/ua-parser-rs/default.nix new file mode 100644 index 000000000000..3bcf626be55c --- /dev/null +++ b/pkgs/development/python-modules/ua-parser-rs/default.nix @@ -0,0 +1,42 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "ua-parser-rs"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ua-parser"; + repo = "uap-rust"; + rev = "refs/tags/ua-parser-rs-${version}"; + hash = "sha256-+qAYNGZFOkQyHhzqZZGrxgKHrPTWolO/4KKuppIMSRE="; + fetchSubmodules = true; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + buildAndTestSubdir = "ua-parser-py"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + meta = { + description = "Native accelerator for ua-parser"; + homepage = "https://github.com/ua-parser/uap-rust/tree/main/ua-parser-py"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + mainProgram = "ua-parser-rs"; + }; +} diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index fa0dfffdf6b0..89cb811fbbab 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -2,42 +2,53 @@ lib, buildPythonPackage, fetchFromGitHub, + google-re2, pyyaml, pytestCheckHook, + setuptools, + setuptools-scm, + ua-parser-builtins, + ua-parser-rs, }: buildPythonPackage rec { pname = "ua-parser"; - version = "0.18.0"; - - format = "setuptools"; + version = "1.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "ua-parser"; repo = "uap-python"; - rev = version; + rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA="; + hash = "sha256-byKtxmuYIsEYyuUmfnbLhfe7EKj0k7QGkK5HewiTiy4="; }; - patches = [ ./dont-fetch-submodule.patch ]; + build-system = [ + pyyaml + setuptools + setuptools-scm + ]; - nativeBuildInputs = [ pyyaml ]; + dependencies = [ + ua-parser-builtins + ]; + + optional-dependencies = { + yaml = [ pyyaml ]; + re2 = [ google-re2 ]; + regex = [ ua-parser-rs ]; + }; nativeCheckInputs = [ pytestCheckHook ]; - preCheck = '' - # import from $out - rm ua_parser/__init__.py - ''; - pythonImportsCheck = [ "ua_parser" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/ua-parser/uap-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Python implementation of the UA Parser"; homepage = "https://github.com/ua-parser/uap-python"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch b/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch deleted file mode 100644 index fa0cfdeabf32..000000000000 --- a/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/setup.py b/setup.py -index a976eee..6919795 100644 ---- a/setup.py -+++ b/setup.py -@@ -64,12 +64,6 @@ class build_regexes(Command): - - def run(self): - work_path = self.work_path -- if not os.path.exists(os.path.join(work_path, ".git")): -- return -- -- log.info("initializing git submodules") -- check_output(["git", "submodule", "init"], cwd=work_path) -- check_output(["git", "submodule", "update"], cwd=work_path) - - yaml_src = os.path.join(work_path, "uap-core", "regexes.yaml") - if not os.path.exists(yaml_src): diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 72803dfd6074..f43ff25f6555 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.10.0"; + version = "2024.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-4hMUh/0/srYIPed647Sh7H7DIp2oV7LN9srzLr0Qxps="; + hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 58cefeb5bef7..fccbb289976e 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.9.4"; + version = "4.9.6"; pyproject = true; disabled = pythonOlder "3.12"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate-python-client"; - rev = "refs/tags/v${version}"; - hash = "sha256-lKb8oxWK8y73zPpPJVX25MYBa6C9n96ZkGxLm3Z9r9U="; + tag = "v${version}"; + hash = "sha256-zg7kHKGYKJH1KzyLIwyrmjKnEVOXEiF7PZfi347BHWc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 109457308110..8494688eaefe 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.5"; + version = "0.60.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg="; + hash = "sha256-sSO+e6pZj7pkkfWF2z5THaD6MrPBX7f1M3nRIoqRC2s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 420fa77d4cd3..0105579be077 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AaDV2EBWCFR9uceWc+GtwhhkUEqRxxVNCgOvu0kFzUU="; + hash = "sha256-scHdQbjIClV+TpLOVC0uf+SVx3kR1DDzcaKWnKMsHoY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 76c7bb8b341e..5d455705a1bb 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.330"; + version = "3.2.332"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-rMovncMrVpvj60WWdU5mBTpR2QVF2DLso1TUGjl3m38="; + hash = "sha256-O4stCuRm847mULyCSs+HXSBLsHIcXxtxXuUVysgd5/o="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -92,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ aioresponses + distutils mock pytest-asyncio pytest-mock diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock deleted file mode 100644 index bb37bb4c275a..000000000000 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ /dev/null @@ -1,6872 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.11", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.11", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" -dependencies = [ - "futures-util", - "native-tls", - "thiserror", - "url", -] - -[[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.58", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b" -dependencies = [ - "futures-io", - "futures-util", - "log", - "native-tls", - "pin-project-lite", - "tokio", - "tokio-native-tls", - "tungstenite", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", - "tokio", -] - -[[package]] -name = "asynchronous-codec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" -dependencies = [ - "bytes", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[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.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "barrel" -version = "0.6.6-alpha.0" -source = "git+https://github.com/prisma/barrel.git?branch=mssql-support#4e84cf3d5013b4c92eb81d7ba90cd1c1c01c6805" - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base36" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c26bddc1271f7112e5ec797e8eeba6de2de211c1488e506b9500196dbf77c5" -dependencies = [ - "base-x", - "failure", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bigdecimal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "black-box-tests" -version = "0.1.0" -dependencies = [ - "anyhow", - "enumflags2", - "indoc 2.0.3", - "insta", - "prisma-metrics", - "query-engine-tests", - "query-tests-setup", - "regex", - "reqwest", - "serde_json", - "tokio", - "user-facing-errors", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive", - "hashbrown 0.12.3", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bson" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" -dependencies = [ - "ahash 0.8.11", - "base64 0.13.1", - "bitvec", - "chrono", - "hex", - "indexmap 2.2.2", - "js-sys", - "once_cell", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "time", - "uuid", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "build-utils" -version = "0.1.0" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cbindgen" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap 1.9.3", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" -dependencies = [ - "shlex", -] - -[[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 = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.0", -] - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[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 = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[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", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "codspeed" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2042d58652a59f53ee0d7f61435b6760b63a9c09a598c7044a8c8b1a0a352afe" -dependencies = [ - "colored", - "libc", -] - -[[package]] -name = "codspeed-criterion-compat" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93201017af114a2ef3df75212aa456aa1a981673d84aa18555014bb89c2a7262" -dependencies = [ - "codspeed", - "colored", - "criterion", -] - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "concat-idents" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "connection-string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" - -[[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 = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-tests" -version = "0.1.0" -dependencies = [ - "dissimilar", - "psl", - "query-core", - "request-handlers", - "schema", - "serde_json", - "user-facing-errors", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.25", - "criterion-plot", - "itertools 0.10.5", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crosstarget-utils" -version = "0.1.0" -dependencies = [ - "derive_more", - "enumflags2", - "futures", - "js-sys", - "pin-project", - "regex", - "tokio", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[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 = "ctor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "cuid" -version = "1.3.2" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" -dependencies = [ - "base36", - "cuid-util", - "cuid2", - "getrandom 0.2.11", - "js-sys", - "num", - "once_cell", - "rand 0.8.5", - "sha3", -] - -[[package]] -name = "cuid-util" -version = "0.1.0" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" - -[[package]] -name = "cuid2" -version = "0.1.2" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" -dependencies = [ - "cuid-util", - "num", - "rand 0.8.5", - "sha3", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[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_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.58", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core 0.20.10", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dashmap" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "datamodel-renderer" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "expect-test", - "indoc 2.0.3", - "itertools 0.12.0", - "once_cell", - "psl", - "regex", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "diagnostics" -version = "0.1.0" -dependencies = [ - "colored", - "indoc 2.0.3", - "pest", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", -] - -[[package]] -name = "dissimilar" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" - -[[package]] -name = "dmmf" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "colored", - "expect-test", - "flate2", - "indexmap 2.2.2", - "indoc 2.0.3", - "itertools 0.12.0", - "pretty_assertions", - "psl", - "query-structure", - "schema", - "serde", - "serde_json", - "similar", -] - -[[package]] -name = "driver-adapters" -version = "0.1.0" -dependencies = [ - "async-trait", - "expect-test", - "futures", - "js-sys", - "napi", - "napi-derive", - "once_cell", - "pin-project", - "prisma-metrics", - "quaint", - "serde", - "serde-wasm-bindgen", - "serde_json", - "serde_repr", - "tokio", - "tracing", - "tracing-core", - "tsify", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-rs-dbg", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "enumflags2" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "expect-test" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" -dependencies = [ - "dissimilar", - "once_cell", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[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", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" -dependencies = [ - "frunk_core", - "frunk_derives", - "frunk_proc_macros", -] - -[[package]] -name = "frunk_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" - -[[package]] -name = "frunk_derives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "frunk_proc_macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" -dependencies = [ - "frunk_core", - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "graphql-parser" -version = "0.3.0" -source = "git+https://github.com/prisma/graphql-parser#6a3f58bd879065588e710cb02b5bd30c1ce182c3" -dependencies = [ - "combine", - "indexmap 1.9.3", - "thiserror", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.9", - "indexmap 2.2.2", - "slab", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hickory-proto" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[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" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http 0.2.9", - "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 = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[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", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[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 = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "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.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", - "unindent", -] - -[[package]] -name = "insta" -version = "1.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "serde", - "similar", - "yaml-rust", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2 0.5.7", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.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.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "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 = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-rpc-api-build" -version = "0.1.0" -dependencies = [ - "backtrace", - "heck 0.3.3", - "serde", - "toml", -] - -[[package]] -name = "jsonrpc-core" -version = "17.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" -dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[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 = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[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 = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "lsp-types" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "md5" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" -dependencies = [ - "ahash 0.8.11", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" -dependencies = [ - "base64 0.22.1", - "indexmap 2.2.2", - "metrics", - "metrics-util", - "quanta", - "thiserror", -] - -[[package]] -name = "metrics-util" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" -dependencies = [ - "aho-corasick", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.14.5", - "indexmap 2.2.2", - "metrics", - "num_cpus", - "ordered-float", - "quanta", - "radix_trie", - "sketches-ddsketch", -] - -[[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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mobc" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f" -dependencies = [ - "async-trait", - "futures-channel", - "futures-core", - "futures-timer", - "futures-util", - "log", - "metrics", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mongodb" -version = "3.0.0" -source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bitflags 1.3.2", - "bson", - "chrono", - "derivative", - "derive_more", - "futures-core", - "futures-executor", - "futures-io", - "futures-util", - "hex", - "hickory-proto", - "hickory-resolver", - "hmac", - "md-5", - "mongodb-internal-macros", - "once_cell", - "pbkdf2", - "percent-encoding", - "rand 0.8.5", - "rustc_version_runtime", - "rustls 0.21.10", - "rustls-pemfile", - "serde", - "serde_bytes", - "serde_with", - "sha-1", - "sha2 0.10.7", - "socket2 0.5.7", - "stringprep", - "strsim 0.11.1", - "take_mut", - "thiserror", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util 0.7.8", - "typed-builder", - "uuid", - "webpki-roots", -] - -[[package]] -name = "mongodb-client" -version = "0.1.0" -dependencies = [ - "mongodb", - "once_cell", - "percent-encoding", - "thiserror", -] - -[[package]] -name = "mongodb-internal-macros" -version = "3.0.0" -source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "mongodb-query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "bson", - "chrono", - "cuid", - "derive_more", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "mongodb", - "mongodb-client", - "pretty_assertions", - "prisma-metrics", - "prisma-value", - "psl", - "query-connector", - "query-structure", - "rand 0.8.5", - "regex", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "mongodb-schema-connector" -version = "0.1.0" -dependencies = [ - "bson", - "convert_case 0.6.0", - "datamodel-renderer", - "dissimilar", - "enumflags2", - "expect-test", - "futures", - "indoc 2.0.3", - "itertools 0.12.0", - "mongodb", - "mongodb-client", - "mongodb-schema-describer", - "names 0.12.0", - "once_cell", - "psl", - "regex", - "schema-connector", - "serde", - "serde_json", - "tokio", - "tracing", - "url", - "user-facing-errors", -] - -[[package]] -name = "mongodb-schema-describer" -version = "0.1.0" -dependencies = [ - "bson", - "futures", - "mongodb", - "serde", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "mysql_async" -version = "0.31.3" -source = "git+https://github.com/prisma/mysql_async?branch=vendored-openssl#0d40d0d2c332fc97512bff81e82e62002f03c224" -dependencies = [ - "bytes", - "crossbeam", - "flate2", - "futures-core", - "futures-sink", - "futures-util", - "lazy_static", - "lexical", - "lru 0.8.1", - "mio", - "mysql_common", - "native-tls", - "once_cell", - "pem", - "percent-encoding", - "pin-project", - "priority-queue", - "regex", - "serde", - "serde_json", - "socket2 0.4.9", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-util 0.7.8", - "twox-hash", - "url", -] - -[[package]] -name = "mysql_common" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" -dependencies = [ - "base64 0.13.1", - "bigdecimal", - "bindgen", - "bitflags 1.3.2", - "bitvec", - "byteorder", - "bytes", - "cc", - "cmake", - "crc32fast", - "flate2", - "frunk", - "lazy_static", - "lexical", - "num-bigint", - "num-traits", - "rand 0.8.5", - "regex", - "rust_decimal", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2 0.10.7", - "smallvec", - "subprocess", - "thiserror", - "time", - "uuid", -] - -[[package]] -name = "names" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" -dependencies = [ - "rand 0.3.23", -] - -[[package]] -name = "names" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "nanoid" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "napi" -version = "2.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b" -dependencies = [ - "bitflags 2.4.0", - "ctor", - "napi-derive", - "napi-sys", - "once_cell", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "napi-build" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" - -[[package]] -name = "napi-derive" -version = "2.16.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1" -dependencies = [ - "cfg-if", - "convert_case 0.6.0", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe" -dependencies = [ - "convert_case 0.6.0", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver", - "syn 2.0.58", -] - -[[package]] -name = "napi-sys" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" -dependencies = [ - "libloading 0.8.1", -] - -[[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 = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[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" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" -dependencies = [ - "bitflags 2.4.0", - "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.58", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.1.6+3.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", - "serde", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http 0.2.9", - "opentelemetry", - "prost", - "thiserror", - "tokio", - "tonic", - "tonic-build", -] - -[[package]] -name = "opentls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" -dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "ordered-float" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordermap" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.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.1", -] - -[[package]] -name = "parse-hyperlinks" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0181d37c4d5ae35cc8be7cf823c1a933005661da6a08bcb2855aa392c9a54b8e" -dependencies = [ - "html-escape", - "nom", - "percent-encoding", - "thiserror", -] - -[[package]] -name = "parser-database" -version = "0.1.0" -dependencies = [ - "diagnostics", - "either", - "enumflags2", - "indexmap 2.2.2", - "rustc-hash", - "schema-ast", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pest_meta" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" -dependencies = [ - "once_cell", - "pest", - "sha2 0.10.7", -] - -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset 0.1.9", - "ordermap", -] - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap 1.9.3", -] - -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - -[[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_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[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 = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -[[package]] -name = "postgres-native-tls" -version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "native-tls", - "tokio", - "tokio-native-tls", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "base64 0.22.1", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "hmac", - "md-5", - "memchr", - "rand 0.8.5", - "sha2 0.10.7", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.8" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "bit-vec", - "bytes", - "chrono", - "fallible-iterator 0.2.0", - "postgres-protocol", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[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 = "prisma-fmt" -version = "0.1.0" -dependencies = [ - "build-utils", - "colored", - "dissimilar", - "dmmf", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "log", - "lsp-types", - "once_cell", - "psl", - "serde", - "serde_json", - "structopt", -] - -[[package]] -name = "prisma-metrics" -version = "0.1.0" -dependencies = [ - "derive_more", - "expect-test", - "futures", - "metrics", - "metrics-exporter-prometheus", - "metrics-util", - "once_cell", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", -] - -[[package]] -name = "prisma-schema-build" -version = "0.1.0" -dependencies = [ - "prisma-fmt", - "wasm-bindgen", - "wasm-logger", -] - -[[package]] -name = "prisma-value" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "bigdecimal", - "chrono", - "once_cell", - "regex", - "serde", - "serde_json", - "uuid", -] - -[[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-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph 0.6.3", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "psl" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "dissimilar", - "either", - "expect-test", - "indoc 2.0.3", - "psl-core", -] - -[[package]] -name = "psl-core" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "cfg-if", - "chrono", - "connection-string", - "diagnostics", - "either", - "enumflags2", - "hex", - "indoc 2.0.3", - "itertools 0.12.0", - "lsp-types", - "once_cell", - "parser-database", - "prisma-value", - "regex", - "schema-ast", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "qe-setup" -version = "0.1.0" -dependencies = [ - "connection-string", - "enumflags2", - "mongodb", - "mongodb-client", - "once_cell", - "psl", - "quaint", - "schema-core", - "serde", - "serde_json", - "sql-schema-connector", - "test-setup", - "tokio", - "url", -] - -[[package]] -name = "quaint" -version = "0.2.0-alpha.13" -dependencies = [ - "async-trait", - "async-tungstenite", - "base64 0.12.3", - "bigdecimal", - "bit-vec", - "byteorder", - "bytes", - "cfg_aliases", - "chrono", - "concat-idents", - "connection-string", - "crosstarget-utils", - "either", - "enumflags2", - "expect-test", - "futures", - "getrandom 0.2.11", - "hex", - "indoc 0.3.6", - "itertools 0.12.0", - "lru-cache", - "mobc", - "mysql_async", - "names 0.11.0", - "native-tls", - "num_cpus", - "once_cell", - "paste", - "percent-encoding", - "postgres-native-tls", - "postgres-types", - "prisma-metrics", - "quaint-test-macros", - "quaint-test-setup", - "regex", - "rusqlite", - "serde", - "serde_json", - "sqlformat", - "thiserror", - "tiberius", - "tokio", - "tokio-postgres", - "tokio-util 0.7.8", - "tracing", - "tracing-futures", - "url", - "uuid", - "ws_stream_tungstenite", -] - -[[package]] -name = "quaint-test-macros" -version = "0.1.0" -dependencies = [ - "darling 0.10.2", - "once_cell", - "proc-macro2", - "quaint-test-setup", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quaint-test-setup" -version = "0.1.0" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "names 0.11.0", - "once_cell", - "quaint", - "tokio", -] - -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "prisma-value", - "query-structure", - "serde", - "serde_json", - "telemetry", - "thiserror", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "chrono", - "connection-string", - "crossbeam-channel", - "crosstarget-utils", - "cuid", - "derive_more", - "enumflags2", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "lru 0.7.8", - "once_cell", - "opentelemetry", - "petgraph 0.4.13", - "prisma-metrics", - "psl", - "query-connector", - "query-structure", - "schema", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "build-utils", - "connection-string", - "enumflags2", - "graphql-parser", - "hyper", - "indoc 2.0.3", - "mongodb-query-connector", - "opentelemetry", - "opentelemetry-otlp", - "prisma-metrics", - "psl", - "quaint", - "query-connector", - "query-core", - "request-handlers", - "serde", - "serde_json", - "serial_test", - "sql-query-connector", - "structopt", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "query-engine-c-abi" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "cbindgen", - "chrono", - "connection-string", - "futures", - "indoc 2.0.3", - "once_cell", - "opentelemetry", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "rusqlite", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine-common" -version = "0.1.0" -dependencies = [ - "async-trait", - "connection-string", - "napi", - "opentelemetry", - "prisma-metrics", - "psl", - "query-connector", - "query-core", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "tsify", - "url", - "user-facing-errors", - "wasm-bindgen", -] - -[[package]] -name = "query-engine-node-api" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "connection-string", - "driver-adapters", - "futures", - "napi", - "napi-build", - "napi-derive", - "opentelemetry", - "prisma-metrics", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "query-engine-tests" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.13.1", - "chrono", - "colored", - "enumflags2", - "futures", - "indoc 2.0.3", - "insta", - "itertools 0.12.0", - "once_cell", - "paste", - "prisma-metrics", - "prisma-value", - "psl", - "query-test-macros", - "query-tests-setup", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine-wasm" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "connection-string", - "driver-adapters", - "futures", - "js-sys", - "opentelemetry", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "serde", - "serde-wasm-bindgen", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "tsify", - "url", - "user-facing-errors", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-rs-dbg", -] - -[[package]] -name = "query-structure" -version = "0.0.0" -dependencies = [ - "bigdecimal", - "chrono", - "cuid", - "getrandom 0.2.11", - "itertools 0.12.0", - "nanoid", - "prisma-value", - "psl", - "thiserror", - "uuid", -] - -[[package]] -name = "query-test-macros" -version = "0.1.0" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "query-tests-setup" -version = "0.1.0" -dependencies = [ - "async-trait", - "colored", - "enumflags2", - "hyper", - "indexmap 2.2.2", - "indoc 2.0.3", - "insta", - "itertools 0.12.0", - "jsonrpc-core", - "nom", - "once_cell", - "parse-hyperlinks", - "prisma-metrics", - "psl", - "qe-setup", - "quaint", - "query-core", - "query-engine", - "query-structure", - "regex", - "request-handlers", - "serde", - "serde_json", - "sql-query-connector", - "strip-ansi-escapes", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-error", - "tracing-futures", - "tracing-subscriber", - "user-facing-errors", -] - -[[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.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[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.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[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.11", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags 2.4.0", -] - -[[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 = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags 2.4.0", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rend" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "request-handlers" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "cfg_aliases", - "codspeed-criterion-compat", - "connection-string", - "dmmf", - "futures", - "graphql-parser", - "indexmap 2.2.2", - "insta", - "itertools 0.12.0", - "mongodb-query-connector", - "once_cell", - "psl", - "quaint", - "query-core", - "query-structure", - "schema", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tracing", - "url", - "user-facing-errors", -] - -[[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", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.10.1", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom 0.2.11", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rusqlite" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" -dependencies = [ - "bitflags 2.4.0", - "chrono", - "fallible-iterator 0.3.0", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust_decimal" -version = "1.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2ab0025103a60ecaaf3abf24db1db240a4e1c15837090d2c32f625ac98abea" -dependencies = [ - "arrayvec 0.7.4", - "borsh", - "byteorder", - "bytes", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustc_version_runtime" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" -dependencies = [ - "rustc_version", - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring 0.17.7", - "rustls-webpki", - "sct 0.7.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "saturating" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "schema" -version = "0.1.0" -dependencies = [ - "codspeed-criterion-compat", - "once_cell", - "psl", - "query-structure", - "rustc-hash", -] - -[[package]] -name = "schema-ast" -version = "0.1.0" -dependencies = [ - "diagnostics", - "pest", - "pest_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schema-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "enumflags2", - "psl", - "quaint", - "serde", - "serde_json", - "sha2 0.9.9", - "tracing", - "tracing-error", - "user-facing-errors", -] - -[[package]] -name = "schema-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "chrono", - "enumflags2", - "json-rpc-api-build", - "jsonrpc-core", - "mongodb-schema-connector", - "psl", - "schema-connector", - "serde", - "serde_json", - "sql-schema-connector", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "schema-engine-cli" -version = "0.1.0" -dependencies = [ - "backtrace", - "base64 0.13.1", - "build-utils", - "connection-string", - "expect-test", - "indoc 2.0.3", - "jsonrpc-core", - "quaint", - "schema-connector", - "schema-core", - "serde", - "serde_json", - "structopt", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "serde" -version = "1.0.206" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.206" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" -dependencies = [ - "indexmap 2.2.2", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.2", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" -dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[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 = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" -dependencies = [ - "bstr", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" - -[[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.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sql-ddl" -version = "0.1.0" -dependencies = [ - "indoc 2.0.3", -] - -[[package]] -name = "sql-introspection-tests" -version = "0.1.0" -dependencies = [ - "barrel", - "connection-string", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "itertools 0.12.0", - "pretty_assertions", - "psl", - "quaint", - "schema-connector", - "sql-schema-connector", - "sql-schema-describer", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - -[[package]] -name = "sql-migration-tests" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "chrono", - "colored", - "connection-string", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "jsonrpc-core", - "once_cell", - "paste", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "schema-core", - "serde", - "serde_json", - "sql-schema-connector", - "sql-schema-describer", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - -[[package]] -name = "sql-query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "chrono", - "cuid", - "expect-test", - "futures", - "itertools 0.12.0", - "once_cell", - "opentelemetry", - "prisma-value", - "psl", - "quaint", - "query-connector", - "query-structure", - "rand 0.8.5", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "sql-schema-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "connection-string", - "datamodel-renderer", - "either", - "enumflags2", - "expect-test", - "indexmap 2.2.2", - "indoc 2.0.3", - "once_cell", - "prisma-value", - "psl", - "quaint", - "regex", - "schema-connector", - "serde", - "serde_json", - "sql-ddl", - "sql-schema-describer", - "sqlformat", - "sqlparser", - "sqlx-core", - "sqlx-sqlite", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", - "uuid", - "versions", -] - -[[package]] -name = "sql-schema-describer" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "either", - "enumflags2", - "expect-test", - "indexmap 2.2.2", - "indoc 2.0.3", - "once_cell", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "regex", - "serde", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-futures", -] - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.0", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlparser" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0366f270dbabb5cc2e4c88427dc4c08bba144f81e32fbd459a013f26a4d16aa0" -dependencies = [ - "log", -] - -[[package]] -name = "sqlx-core" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" -dependencies = [ - "atoi", - "byteorder", - "bytes", - "crossbeam-queue", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.14.5", - "hashlink", - "hex", - "indexmap 2.2.2", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "smallvec", - "sqlformat", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde_urlencoded", - "sqlx-core", - "tracing", - "url", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stringprep" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[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 = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "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.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "telemetry" -version = "0.1.0" -dependencies = [ - "async-trait", - "crossbeam-channel", - "crosstarget-utils", - "cuid", - "derive_more", - "enumflags2", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "lru 0.7.8", - "once_cell", - "opentelemetry", - "prisma-metrics", - "psl", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "tempfile" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "test-cli" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "colored", - "dmmf", - "enumflags2", - "psl", - "schema-connector", - "schema-core", - "serde_json", - "structopt", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", -] - -[[package]] -name = "test-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "test-setup" -version = "0.1.0" -dependencies = [ - "connection-string", - "dissimilar", - "enumflags2", - "once_cell", - "quaint", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[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.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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 = "tiberius" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091052ba8f20c1e14f85913a5242a663a09d17ff4c0137b9b1f0735cb3c5dabc" -dependencies = [ - "async-native-tls", - "async-trait", - "asynchronous-codec", - "bigdecimal", - "byteorder", - "bytes", - "chrono", - "connection-string", - "encoding", - "enumflags2", - "futures", - "futures-sink", - "futures-util", - "num-traits", - "once_cell", - "opentls", - "pin-project-lite", - "pretty-hex", - "thiserror", - "tokio", - "tokio-util 0.7.8", - "tracing", - "uuid", - "winauth", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[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.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.12" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand 0.8.5", - "socket2 0.5.7", - "tokio", - "tokio-util 0.7.8", - "whoami", -] - -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "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.10", - "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-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util 0.6.10", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "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", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util 0.7.8", - "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.58", -] - -[[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-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" -dependencies = [ - "once_cell", - "opentelemetry", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tsify" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" -dependencies = [ - "gloo-utils", - "serde", - "serde_json", - "tsify-macros", - "wasm-bindgen", -] - -[[package]] -name = "tsify-macros" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.58", -] - -[[package]] -name = "tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "native-tls", - "rand 0.8.5", - "sha1", - "thiserror", - "utf-8", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand 0.3.23", - "static_assertions", -] - -[[package]] -name = "typed-builder" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "user-facing-error-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "user-facing-errors" -version = "0.1.0" -dependencies = [ - "backtrace", - "indoc 2.0.3", - "itertools 0.12.0", - "quaint", - "serde", - "serde_json", - "tracing", - "user-facing-error-macros", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom 0.2.11", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "versions" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37ff4899935ba747849dd9eeb27c0bdd0da0210236704b7e4681a6c7bd6f9c6" -dependencies = [ - "itertools 0.12.0", - "nom", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec 0.5.2", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-rs-dbg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e5fe4ac478ca5cf1db842029f41a5881da39e70320deb0006912f226ea63f4" -dependencies = [ - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[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 = "whoami" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" -dependencies = [ - "redox_syscall 0.5.7", - "wasite", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[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 = "winauth" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f820cd208ce9c6b050812dc2d724ba98c6c1e9db5ce9b3f58d925ae5723a5e6" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "md5", - "rand 0.7.3", - "winapi", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - -[[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.1", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -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-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws_stream_tungstenite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed39ff9f8b2eda91bf6390f9f49eee93d655489e15708e3bb638c1c4f07cecb4" -dependencies = [ - "async-tungstenite", - "async_io_stream", - "bitflags 2.4.0", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "pharos", - "rustc_version", - "tokio", - "tracing", - "tungstenite", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[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 = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 777088bb7c64..c61bde4f96c3 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -12,30 +12,21 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.22.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-aCzm7pEsgbZ4ZNir3DLNnUlmiydOpLNcW2FpIQ44B6E="; + hash = "sha256-wrhOUUF3N0JvDxcqypL7q+B7SwAfLq9M0Zqs86jnB/M="; }; + useFetchCargoVendor = true; + cargoHash = "sha256-l5b7TcVgnTdUsUncvfJYBcmh0xhF3fMfoCx0cyjpJ8Y="; + # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; - "cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA="; - "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; - "mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg="; - "postgres-native-tls-0.5.0" = "sha256-pzMPNZzlvMaQqBu/V3ExPYVnoIaALeUaYJ4oo/hY9lA="; - "mongodb-3.0.0" = "sha256-1WQgY0zSZhFjt1nrLYTUBrpqBxpCCgKRSeGJLtkE6pw="; - }; - }; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 2236d27be2b3..4d4efc7b3608 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -9,7 +9,7 @@ , installShellFiles , jq , libayatana-appindicator -, libsoup +, libsoup_2_4 , makeDesktopItem , mkYarnPackage , openssl @@ -141,7 +141,7 @@ rec { ]; buildInputs = [ - libsoup + libsoup_2_4 openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 8d01cbeb5db8..ae3c3ce32192 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -32,7 +32,7 @@ , gnutar , json-glib , libcap -, libsoup +, libsoup_2_4 , libyaml , ostree , patch @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { glib json-glib libcap - libsoup + libsoup_2_4 libxml2 libyaml ostree diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 88b740fb6cd4..05538598dd69 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.9"; + version = "1.6.10"; patches = [ # adds a check which adds an error message when trying to @@ -14,10 +14,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-YjLBfQ6L3UwcgQ9LgUfnNSegNhQI8/Gb5Hdpe0/uzOc="; + hash = "sha256-D0x+87bKVtZPHJcwZUJ49JXp2o32ieOw/etnE69c8CI="; }; - vendorHash = "sha256-Uir/umJNnTHWEKPbVch0Pq7B3hVim8BMtGc/M9esADw="; + vendorHash = "sha256-2oEIBIr8oc1ku/k9mlLSg6Q6BbUleufvlmWOaV6wPfU="; excludedPackages = [ "build" "man" ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch b/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch index 6023a5934c8f..478ccb45ff9b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch +++ b/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch @@ -1,11 +1,11 @@ diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs -index 9c1d8dfc..a5cfc74c 100644 +index 4e3effed..74b4d3e3 100644 --- a/cli/loader/src/lib.rs +++ b/cli/loader/src/lib.rs -@@ -747,7 +747,7 @@ impl Loader { - Podman, +@@ -969,7 +969,7 @@ impl Loader { } + let root_path = root_path.unwrap_or(src_path); - let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" }; + let emcc_name = if cfg!(windows) { "emcc.bat" } else { "@emcc@" }; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 860fcb1cc0a4..e6225bcd8296 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -12,8 +12,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.14.4"; - hash = "sha256-JqcmtjO2KaP6vaAG9pauQmCVSjYyyAVBEteuiXeeX5o="; + version = "9.15.0"; + hash = "sha256-Caj+MaNP2nBjVGgGGfQAL0zO9trf+TJA0k72yDHw/Sg="; }; }; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 16ef0f6ea57b..cb1321e451e5 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.52"; + version = "0.1.53"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ArFQaQQU6lOT5wS9vxC+hCYpDWaq7D1DbQhjGzPQEjo="; + sha256 = "sha256-l5r0ZbF3LlGzJgMt0rPizzP0ZBLJQNLGBynPw4nAwMc="; }; - cargoHash = "sha256-fRTOhZVehGBwQcJQM/GWmLgfaDK7aJFYz772MPYhkn4="; + cargoHash = "sha256-XRK26pYVUVOUAQsWxIhY2m5bwSIqCMBZ2r34eN3RQiE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 14e859c9c510..b8de6ef462ed 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-y1//nTmNDU8hw3wumVeK2kN2b7xoB7X5Kdg16/0HUms="; - aarch64-linux = "sha256-o1jubyQBq/z83CPzTII6ZclZUHVXVahsu024GXFrxX8="; - armv7l-linux = "sha256-+hb5ahgDCLSoR5o3YovdDp6igbXkHhxu0Lu1iY8Xros="; - x86_64-darwin = "sha256-raeEz+Kd3cfzPGTKC79h51vcXpGGDRuZY7luDGZphbs="; - x86_64-linux = "sha256-haR0CRyHcK8hXUAkW968Ui6vGpiPP5V1mi7n6lOS71M="; + aarch64-darwin = "sha256-AXUcYBnBtL94fS4LHyIb7xvMAQzvVTE/wGkfO2o7Z28="; + aarch64-linux = "sha256-HmdGu6bz0011UIiaGgCauQ7jeUpevOYO0QaIrRBoCoc="; + armv7l-linux = "sha256-OLWmAuwp1/W+DUx4N9pgedg2mELT+hFMYiUJu06g35U="; + x86_64-darwin = "sha256-IglipvNx/DFgX4lWmtZHMJy9g0cc2MKbg/I1pQHDnc4="; + x86_64-linux = "sha256-M/JUtUyHVPFu++K+HeOMolGSYw3DbxZFladw1Lv02JM="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.4.14"; + version = "3.4.16"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 9f3cdb067fde..f5b746938845 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -112,7 +112,7 @@ buildFHSEnv { libpulseaudio libselinux libsndfile - libsoup + libsoup_2_4 libtheora libtiff libunwind diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index b4a2d2b64940..2de325afb97b 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -9,16 +9,16 @@ }: buildNpmPackage rec { pname = "krohnkite"; - version = "0.9.8.3"; + version = "0.9.8.4"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; rev = "refs/tags/${version}"; - hash = "sha256-PiGpYOKvBpwkPfDWHlOhq7dwyBYzfzfJVURiEC1a78g="; + hash = "sha256-VVHusFuQ/awfFV4izId7VPYCrS8riTavhpB2KpJ9084="; }; - npmDepsHash = "sha256-IUGRxDCn/aEebCgDPElEPKOxfoYmLoFHVROkTJpNISY="; + npmDepsHash = "sha256-k44SltKLR/Y8qWFCLW2jBWElk9JGn+0azQn0G1f0vuY="; dontWrapQtApps = true; diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json index 936c0ffedd64..114667dcd9d1 100644 --- a/pkgs/kde/third-party/krohnkite/package-lock.json +++ b/pkgs/kde/third-party/krohnkite/package-lock.json @@ -1,12 +1,12 @@ { "name": "krohnkite", - "version": "0.9.8.3", + "version": "0.9.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "krohnkite", - "version": "0.9.8.3", + "version": "0.9.8.4", "license": "MIT", "devDependencies": { "mocha": "^10.4.0", diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d5688d3bc351..e4f44dbf2947 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,18 +1,18 @@ { lib -, avahi , bc , coreutils , cups , dbus , dejavu_fonts -, fetchurl -, fetchpatch +, fetchFromGitHub , fontconfig , gawk , ghostscript , gnugrep , gnused , ijs +, libcupsfilters +, libppd , libexif , libjpeg , liblouis @@ -30,70 +30,41 @@ , withAvahi ? true }: -let +(if !withAvahi then lib.warn "the 'withAvahi' parameter to 'cups-filters' is deprecated, as the cups-browsed component (which does not make sense without avahi) has been split out of the cups-filters package (which no longer needs avahi)" else lib.id) + +(let binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.17"; + version = "2.0.1"; - src = fetchurl { - url = "https://github.com/OpenPrinting/cups-filters/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Jwo3UqlgNoqpnUMftdNPQDmyrJQ8V22EBhLR2Bhcm7k="; + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-filters"; + rev = version; + hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-24805.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch"; - hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys="; - }) - (fetchpatch { - name = "CVE-2024-47076.patch"; - url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch"; - hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk="; - }) - (fetchpatch { - name = "remove-cups-ldap-browse-protocols_CVE-2024-47176_CVE-2024-47850.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/6fd2bdfbdce76149af531ce9fca9062304238451.patch"; - hash = "sha256-XS1ODy7i7ilgEjsKuEvOUiRN9pqsj+bOktKoshKcg8Q="; - }) - ]; - nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ cups - dbus - fontconfig ghostscript - ijs - libexif - libjpeg - liblouis # braille embosser support - libpng + libcupsfilters + libppd mupdf - perl - poppler - poppler_utils - qpdf - ] ++ lib.optionals withAvahi [ avahi ]; + ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" - "--with-pdftops=pdftops" - "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--with-gs-path=${ghostscript}/bin/gs" - "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" "--with-ippfind-path=${cups}/bin/ippfind" - "--enable-imagefilters" - "--with-rcdir=no" "--with-shell=${stdenv.shell}" - "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; + ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; @@ -130,4 +101,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4d96c78cb560..4234894fcfd8 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -11,19 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = "wiki-tui"; rev = "v${version}"; - hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U="; + hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; }; - # Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next - # release (see: https://github.com/NixOS/nixpkgs/issues/332957) - cargoPatches = [ ./time.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -31,7 +27,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; + cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk="; meta = with lib; { description = "Simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/misc/wiki-tui/time.patch b/pkgs/misc/wiki-tui/time.patch deleted file mode 100644 index 09cd2a41d36e..000000000000 --- a/pkgs/misc/wiki-tui/time.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e66f0ac..918c3b2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -318,7 +318,7 @@ dependencies = [ - "log", - "num", - "owning_ref", -- "time 0.3.22", -+ "time 0.3.36", - "unicode-segmentation", - "unicode-width", - "xi-unicode", -@@ -344,7 +344,7 @@ dependencies = [ - "ident_case", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" - dependencies = [ - "darling_core", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", -+] -+ -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", - ] - - [[package]] -@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -448,7 +457,7 @@ dependencies = [ - "darling", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1025,6 +1034,12 @@ dependencies = [ - "num-traits", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.45" -@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1282,6 +1297,12 @@ version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -1518,9 +1539,9 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] -@@ -1537,13 +1558,13 @@ dependencies = [ - - [[package]] - name = "serde_derive" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1750,9 +1771,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.23" -+version = "2.0.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" - dependencies = [ - "proc-macro2", - "quote", -@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1859,13 +1880,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.22" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1873,16 +1897,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -2133,7 +2158,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-shared", - ] - -@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 33034e2f6f5b..8a21ef667a9f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -29,7 +29,7 @@ let homepage = "https://apparmor.net/"; description = "Mandatory access control system - ${component}"; license = with licenses; [ gpl2Only lgpl21Only ]; - maintainers = with maintainers; [ julm thoughtpolice ]; + maintainers = with maintainers; [ julm thoughtpolice grimmauld ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 47a8ac0151a8..cf6d71ef6528 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,16 +5,16 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.12.1"; #zen + version = "6.12.2"; #zen suffix = "zen1"; #zen - sha256 = "18aws41zlayv4xd6489jzrhr8b3kwmrx2q1b50g67v4rsp02sb4p"; #zen + sha256 = "0a6anmfm6495j6lwlywr62ghpwdvbdn54bl5baya5jz7vfqc1ghj"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { - version = "6.12.1"; #lqx - suffix = "lqx1"; #lqx - sha256 = "1q8rdghkgq0kn530pxncwsrfqlf3xfn4mdvxysdizyfn71vmrz8f"; #lqx + version = "6.12.2"; #lqx + suffix = "lqx3"; #lqx + sha256 = "18ibc0dz70vxb61mzdhbhbjg0kfxgcsrl3zdki0cqlhcvfxwk19h"; #lqx isLqx = true; }; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fafe4e209d66..af28371ac6d1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2299,14 +2299,13 @@ hassil home-assistant-intents ifaddr - lmcloud mutagen pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; + ]; # missing inputs: lmcloud "lametric" = ps: with ps; [ demetriek ]; @@ -5458,7 +5457,6 @@ "kostal_plenticore" "kraken" "kulersky" - "lamarzocco" "lametric" "landisgyr_heat_meter" "lastfm" diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index a06c1896d66b..de8574900e0d 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-K46rlurJCFliCphoIdE2z9Zhpo8sJ4Wq/+xSfHJoPRc="; + hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index c79635fae926..173c3220a6fb 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-oJXbDuHT5temcei3ea1cUsqVB70am6WZjHbIehnZs6k="; + hash = "sha256-8+KzZCfBYvXO73SrMXLGCUjecxKn49hz0wCXWCUBULU="; }; dependencies = [ aiofiles ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index 58f60a2406d5..be2b26c7a004 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -39,6 +39,8 @@ universal-remote-card = callPackage ./universal-remote-card { }; + vacuum-card = callPackage ./vacuum-card { }; + valetudo-map-card = callPackage ./valetudo-map-card { }; weather-card = callPackage ./weather-card { }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix new file mode 100755 index 000000000000..7caf03b226a0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "vacuum-card"; + version = "2.10.1"; + + src = fetchFromGitHub { + owner = "denysdovhan"; + repo = "vacuum-card"; + rev = "v${version}"; + hash = "sha256-NJeD6YhXmNNBuhRWjK74sTrxzXyGSbehm5lz05sNA3Y="; + }; + + npmDepsHash = "sha256-x+pq58chBSgFVGr9Xtka5/MH/AHV0zMpyKfA/kEEXBM="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp dist/vacuum-card.js $out + + runHook postInstall + ''; + + passthru.entrypoint = "vacuum-card.js"; + + meta = with lib; { + description = "Vacuum cleaner card for Home Assistant Lovelace UI"; + homepage = "https://github.com/denysdovhan/vacuum-card"; + license = licenses.mit; + maintainers = with maintainers; [ baksa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 0d38e49d6276..23f42fa49df4 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -206,8 +206,8 @@ stdenv.mkDerivation { postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; - in noSourceRefs + postInstall; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $(readlink -fn $out/bin/nginx)\n") modules; + in postInstall + noSourceRefs; passthru = { inherit modules; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 65191c6d713a..0073fae047be 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,6 +5,7 @@ , perl , postgresql , nixosTests +, withPostgres ? true , ... }@args: @@ -37,7 +38,7 @@ callPackage ../nginx/generic.nix args rec { patchShebangs configure bundle/ ''; - configureFlags = [ "--with-http_postgres_module" ]; + configureFlags = lib.optional withPostgres [ "--with-http_postgres_module" ]; postInstall = '' ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 7d872128f1f9..9af26fb2af30 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-09-22T00-33-43Z"; + version = "2024-11-07T00-52-20Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-/2H79fJYdusFNBXj/2i4p+O16wseHzPzJ5LnS1O+Gm4="; + hash = "sha256-vWrNqfB41Y3MAF9PuyopIDrGq4Bj41Y4gISbN6nO0zU="; }; - vendorHash = "sha256-MDClQjCh/ygdbybE4jIoWGBsqr3roNn7stXUw9eoN2Y="; + vendorHash = "sha256-yYAEh4L1eStx0/bID0+wZ5kdqPYshJrSZgVGuXgtgvs="; doCheck = false; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 12e3019d5225..8fcc689ddd66 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.18.3"; - hash = "sha256-2PwLTWQeaVR80slZ6/BPr23gVahiDWXulFtdjc9ZUCs="; + version = "2.19.2"; + hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc="; }; mir_2_15 = common { diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index cbd46b2cd143..55c62327a0df 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-oZYBojtP4h/cl2YkKJ54JT8PTZpzvbZVbaFAEL1sAE8="; + hash = "sha256-wMUVxhYFZzMUGijyS6sPWxSofqO6qvTt9i2hI+gwlwU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 124297a9b752..a8decc0a33ba 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -118,13 +118,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-QURq7ysSsxmBOtoBlPTPWiloXQpjEdxnM0L1fLwXfpw="; + sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0="; }; buildInputs = [ diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 6c56f007354b..1143a4f50b68 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -10,8 +10,8 @@ let in buildMongoDB { inherit avxSupport; - version = "6.0.18"; - sha256 = "sha256-Nq3xwR/z11HsZs8cC9Yr0Xkjg0l1MLb0YRFHsAeQKTM="; + version = "6.0.19"; + sha256 = "sha256-qcf+6hMg0LASeOoZJPoRCQ9ajCJBqSsBDg2Wp+2SMKY="; patches = [ # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing ./fix-gcc-13-ctype-6_0.patch diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index 42a425f4288e..83f02ecb4a54 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -25,8 +25,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.14"; - sha256 = "sha256-3NUv/Rr6V0rH6zHCXJwHZ7ZQOqMJvYGessNVemUF6g0="; + version = "7.0.15"; + sha256 = "sha256-oVH0pBV22J//hVhrwx3uuBT/ML8W2N2HvzqYhuRuM68="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 25e49179db47..390540ea6e12 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-IeryDlBFG+fu0FyqlNujkF+O+YwfQm0hoMMvp/vN0IQ="; + npmDepsHash = "sha256-2q+3NgXkpqdljW/AnBU44002arMc0K/Rl15eqr+oa9E="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index cea79820fef5..ddf32bcadfe9 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-5tu81kB9UDui2/n5KJLRug4IHeDihuv8+HWeo0saqAM="; + hash = "sha256-uoOkr5awBa7MQA4tNUzFp7we5zVnBpjX6V6fNcTI84o="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 3f23adb167e4..1b1a5bd51aeb 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-G9UzA/laXEiU101ehFwhi0i6PAeErNWqmb1fu4W+cII="; + npmDepsHash = "sha256-TC3I3suUJTCmKykitpf2vvO6aGUSoYWOnB3jFwV2W/4="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 19c7efdf70f2..765599e00f1d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,13 +2,13 @@ buildPostgresqlExtension rec { pname = "pg_partman"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GrVOJ5ywZMyqyDroYDLdKkXDdIJSDGhDfveO/ZvrmYs="; + sha256 = "sha256-DdF1UwfeAM4tlcvdXaiz28JA2UwNwPpXnSw5D9eZDlQ="; }; meta = with lib; { diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix index 2fedc633b176..6aa3d3bab590 100644 --- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -21,7 +21,7 @@ let removeReferencesTo ]; postFixup = (oldAttrs.postFixup or "") + '' - remove-references-to -t ${dotnet-runtime.unwrapped} "$out/bin/Application" + remove-references-to -t ${dotnet-runtime} "$out/bin/Application" ''; }); @@ -46,7 +46,7 @@ in use-dotnet-root-env = testers.testEqualContents { assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper"; expected = runtimeVersionFile; - actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime.unwrapped}/share/dotnet"; } '' + actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime}/share/dotnet"; } '' ${appWithoutFallback}/bin/Application >"$out" ''; }; diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index f9caa657923b..ed3c873d162f 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-bU23sCjU3lUQszqyLHjKTxUKj0ngkkrUb8xYi9XSFj0="; + hash = "sha256-Bq9Kaz6m8twOjX0Y05TXPpYYQJqKe86WxhBmNEHAOfA="; }; # TODO: diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 2b9ee3bc5d03..bcb22caab20c 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -1,27 +1,47 @@ -{ aacgain -, ffmpeg -, flac -, imagemagick -, keyfinder-cli -, mp3gain -, mp3val -, python3Packages -, ... -}: { +{ + aacgain, + ffmpeg, + flac, + imagemagick, + keyfinder-cli, + mp3gain, + mp3val, + python3Packages, + ... +}: +{ absubmit = { deprecated = true; testPaths = [ ]; }; - - acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ]; + advancedrewrite = { + testPaths = [ ]; + }; + acousticbrainz = { + deprecated = true; + propagatedBuildInputs = [ python3Packages.requests ]; + }; albumtypes = { }; aura = { - propagatedBuildInputs = with python3Packages; [ flask pillow ]; - testPaths = [ ]; + propagatedBuildInputs = with python3Packages; [ + flask + flask-cors + pillow + ]; + }; + autobpm = { + propagatedBuildInputs = with python3Packages; [ + librosa + # An optional dependency of librosa, needed for beets' autobpm + resampy + ]; }; badfiles = { testPaths = [ ]; - wrapperBins = [ mp3val flac ]; + wrapperBins = [ + mp3val + flac + ]; }; bareasc = { }; beatport.propagatedBuildInputs = [ python3Packages.requests-oauthlib ]; @@ -39,7 +59,10 @@ propagatedBuildInputs = [ python3Packages.requests ]; testPaths = [ ]; }; - discogs.propagatedBuildInputs = with python3Packages; [ discogs-client requests ]; + discogs.propagatedBuildInputs = with python3Packages; [ + discogs-client + requests + ]; duplicates.testPaths = [ ]; edit = { }; embedart = { @@ -49,7 +72,12 @@ embyupdate.propagatedBuildInputs = [ python3Packages.requests ]; export = { }; fetchart = { - propagatedBuildInputs = with python3Packages; [ requests pillow ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + langdetect + pillow + requests + ]; wrapperBins = [ imagemagick ]; }; filefilter = { }; @@ -76,11 +104,19 @@ propagatedBuildInputs = [ python3Packages.pylast ]; testPaths = [ ]; }; + limit = { }; + listenbrainz = { + testPaths = [ ]; + }; loadext = { propagatedBuildInputs = [ python3Packages.requests ]; testPaths = [ ]; }; - lyrics.propagatedBuildInputs = [ python3Packages.beautifulsoup4 ]; + lyrics.propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + langdetect + requests + ]; mbcollection.testPaths = [ ]; mbsubmit = { }; mbsync = { }; @@ -97,8 +133,12 @@ playlist.propagatedBuildInputs = [ python3Packages.requests ]; plexupdate = { }; random = { }; - replaygain.wrapperBins = [ aacgain ffmpeg mp3gain ]; - rewrite.testPaths= [ ]; + replaygain.wrapperBins = [ + aacgain + ffmpeg + mp3gain + ]; + rewrite.testPaths = [ ]; scrub.testPaths = [ ]; smartplaylist = { }; sonosupdate = { @@ -111,31 +151,22 @@ testPaths = [ ]; }; subsonicupdate.propagatedBuildInputs = [ python3Packages.requests ]; + substitute = { + testPaths = [ ]; + }; the = { }; thumbnails = { - propagatedBuildInputs = with python3Packages; [ pillow pyxdg ]; + propagatedBuildInputs = with python3Packages; [ + pillow + pyxdg + ]; wrapperBins = [ imagemagick ]; }; types.testPaths = [ "test/plugins/test_types_plugin.py" ]; unimported.testPaths = [ ]; - web.propagatedBuildInputs = [ python3Packages.flask ]; + web.propagatedBuildInputs = with python3Packages; [ + flask + flask-cors + ]; zero = { }; - limit = { }; - substitute = { - testPaths = [ ]; - }; - advancedrewrite = { - testPaths = [ ]; - }; - autobpm = { - propagatedBuildInputs = with python3Packages; [ - librosa - # An optional dependency of librosa, needed for beets' autobpm - resampy - ]; - testPaths = [ ]; - }; - listenbrainz = { - testPaths = [ ]; - }; } diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index c8064a6310d0..07db91eba091 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -1,94 +1,104 @@ -{ fetchpatch -, bashInteractive -, diffPlugins -, glibcLocales -, gobject-introspection -, gst_all_1 -, lib -, python3Packages -, sphinxHook -, runtimeShell -, writeScript +{ + lib, + src, + version, + bashInteractive, + diffPlugins, + gobject-introspection, + gst_all_1, + python3Packages, + sphinxHook, + runtimeShell, + writeScript, - # plugin deps -, aacgain -, essentia-extractor -, ffmpeg -, flac -, imagemagick -, keyfinder-cli -, mp3gain -, mp3val + # plugin deps, used indirectly by the @inputs when we `import ./builtin-plugins.nix` + aacgain, + essentia-extractor, + ffmpeg, + flac, + imagemagick, + keyfinder-cli, + mp3gain, + mp3val, -, src -, version -, extraPatches ? [ ] -, pluginOverrides ? { } -, disableAllPlugins ? false -, disabledTests ? [] -, extraNativeBuildInputs ? [] + extraPatches ? [ ], + pluginOverrides ? { }, + disableAllPlugins ? false, + disabledTests ? [ ], + extraNativeBuildInputs ? [ ], # tests -, runCommand -, beets + runCommand, + beets, }@inputs: let inherit (lib) attrNames attrValues concatMap; - mkPlugin = { name - , enable ? !disableAllPlugins - , builtin ? false - , propagatedBuildInputs ? [ ] - , testPaths ? [ - # NOTE: This conditional can be removed when beets-stable is updated and - # the default plugins test path is changed - (if (lib.versions.majorMinor version) == "1.6" then - "test/test_${name}.py" - else - "test/plugins/test_${name}.py" - ) - ] - , wrapperBins ? [ ] - }: { - inherit name enable builtin propagatedBuildInputs testPaths wrapperBins; - }; + mkPlugin = + { + name, + enable ? !disableAllPlugins, + builtin ? false, + propagatedBuildInputs ? [ ], + testPaths ? [ + "test/plugins/test_${name}.py" + ], + wrapperBins ? [ ], + }: + { + inherit + name + enable + builtin + propagatedBuildInputs + testPaths + wrapperBins + ; + }; basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs); - pluginOverrides' = lib.mapAttrs - (plugName: lib.throwIf - (basePlugins.${plugName}.deprecated or false) + pluginOverrides' = lib.mapAttrs ( + plugName: + lib.throwIf (basePlugins.${plugName}.deprecated or false) "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation." - ) - pluginOverrides - ; + ) pluginOverrides; - allPlugins = lib.mapAttrs ( n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides'); + allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) ( + lib.recursiveUpdate basePlugins pluginOverrides' + ); builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins; enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins; disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins; + disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins)); pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins); in python3Packages.buildPythonApplication { pname = "beets"; inherit src version; + pyproject = true; patches = extraPatches; - propagatedBuildInputs = with python3Packages; [ - confuse - gst-python - jellyfish - mediafile - munkres - musicbrainzngs - mutagen - pygobject3 - pyyaml - reflink - unidecode - typing-extensions - ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); + build-system = [ + python3Packages.poetry-core + ]; + + dependencies = + with python3Packages; + [ + confuse + gst-python + jellyfish + mediafile + munkres + musicbrainzngs + platformdirs + pyyaml + unidecode + typing-extensions + ] + ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); nativeBuildInputs = [ gobject-introspection @@ -96,15 +106,24 @@ python3Packages.buildPythonApplication { python3Packages.pydata-sphinx-theme ] ++ extraNativeBuildInputs; - buildInputs = [ - ] ++ (with gst_all_1; [ - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - ]); + buildInputs = + [ + ] + ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + ]); - outputs = [ "out" "doc" "man" ]; - sphinxBuilders = [ "html" "man" ]; + outputs = [ + "out" + "doc" + "man" + ]; + sphinxBuilders = [ + "html" + "man" + ]; postInstall = '' mkdir -p $out/share/zsh/site-functions @@ -117,18 +136,29 @@ python3Packages.buildPythonApplication { "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}" ]; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - pytest-cov - mock - rarfile - responses - ] ++ pluginWrapperBins; + nativeCheckInputs = + with python3Packages; + [ + pytestCheckHook + pytest-cov + mock + rarfile + responses + ] + ++ pluginWrapperBins; __darwinAllowLocalNetworking = true; - disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins)); - inherit disabledTests; + disabledTestPaths = disabledTestPaths ++ [ + # touches network + "test/plugins/test_aura.py" + ]; + disabledTests = disabledTests ++ [ + # beets.ui.UserError: unknown command 'autobpm' + "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_import" + # AssertionError: assert 0 == 117 + "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_command" + ]; # Perform extra "sanity checks", before running pytest tests. preCheck = '' @@ -152,30 +182,38 @@ python3Packages.buildPythonApplication { env EDITOR=true "$out/bin/beet" config -e ''; - passthru.plugins = allPlugins; - passthru.tests.gstreamer = runCommand "beets-gstreamer-test" { - meta.timeout = 60; - } '' - set -euo pipefail - export HOME=$(mktemp -d) - mkdir $out + passthru.tests.gstreamer = + runCommand "beets-gstreamer-test" + { + meta.timeout = 60; + } + '' + set -euo pipefail + export HOME=$(mktemp -d) + mkdir $out - cat << EOF > $out/config.yaml -replaygain: - backend: gstreamer -EOF + cat << EOF > $out/config.yaml + replaygain: + backend: gstreamer + EOF - ${beets}/bin/beet -c $out/config.yaml > /dev/null - ''; + ${beets}/bin/beet -c $out/config.yaml > /dev/null + ''; - meta = with lib; { + meta = { description = "Music tagger and library organizer"; homepage = "https://beets.io"; - license = licenses.mit; - maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aszlig + doronbehar + lovesegfault + montchr + pjones + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "beet"; }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 85244c0e0b89..9bd644c3d115 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,34 +1,33 @@ -{ lib -, callPackage -, fetchFromGitHub -, python3Packages +{ + lib, + callPackage, + fetchFromGitHub, + python3Packages, }: /* -** To customize the enabled beets plugins, use the pluginOverrides input to the -** derivation. -** Examples: -** -** Disabling a builtin plugin: -** beets.override { pluginOverrides = { beatport.enable = false; }; } -** -** Enabling an external plugin: -** beets.override { pluginOverrides = { -** alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; }; -** }; } + ** To customize the enabled beets plugins, use the pluginOverrides input to the + ** derivation. + ** Examples: + ** + ** Disabling a builtin plugin: + ** beets.override { pluginOverrides = { beatport.enable = false; }; } + ** + ** Enabling an external plugin: + ** beets.override { pluginOverrides = { + ** alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; }; + ** }; } */ lib.makeExtensible (self: { beets = self.beets-stable; beets-stable = callPackage ./common.nix rec { inherit python3Packages; - # NOTE: ./builtin-plugins.nix and ./common.nix can have some conditionals - # be removed when stable version updates - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; rev = "v${version}"; - hash = "sha256-6pmImyopy0zFBDYoqDyWcBv61FK1kGsZwW2+7fzAnq8="; + hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM="; }; extraPatches = [ # Bash completion fix for Nix @@ -40,12 +39,12 @@ lib.makeExtensible (self: { beets-unstable = callPackage ./common.nix { inherit python3Packages; - version = "2.0.0-unstable-2024-05-25"; + version = "2.2.0-unstable-2024-12-02"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "2130404217684f22f36de00663428602b3f96d84"; - hash = "sha256-trqF6YVBcv+i5H4Ez3PKnRQ6mV2Ly/cw3UJC7pl19og="; + rev = "f92c0ec8b14fbd59e58374fd123563123aef197b"; + hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM="; }; extraPatches = [ # Bash completion fix for Nix @@ -55,5 +54,6 @@ lib.makeExtensible (self: { alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; }; copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; }; - extrafiles = callPackage ./plugins/extrafiles.nix { beets = self.beets-minimal; }; + + extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0"; }) diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 440c476309a6..d2520fcaca63 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, beets, python3Packages }: +{ + lib, + fetchFromGitHub, + beets, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "beets-alternatives"; @@ -27,10 +32,13 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - meta = with lib; { + meta = { description = "Beets plugin to manage external files"; homepage = "https://github.com/geigerzaehler/beets-alternatives"; - maintainers = with maintainers; [ aszlig lovesegfault ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ + aszlig + lovesegfault + ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index d9d95a9f25d9..d1a915a70915 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, beets, python3Packages }: +{ + lib, + fetchFromGitHub, + beets, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "beets-copyartifacts"; @@ -15,6 +20,10 @@ python3Packages.buildPythonApplication rec { sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py sed -i -e '/namespace_packages/d' setup.py printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py + + # beets v2.1.0 compat + # + sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py ''; pytestFlagsArray = [ "-r fEs" ]; diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix deleted file mode 100644 index 829d55c257e5..000000000000 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchFromGitHub, beets, python3Packages }: - -python3Packages.buildPythonApplication { - pname = "beets-extrafiles"; - version = "unstable-2020-12-13"; - - src = fetchFromGitHub { - repo = "beets-extrafiles"; - owner = "Holzhaus"; - rev = "a1d6ef9a9682b6bf7af9483541e56a3ff12247b8"; - sha256 = "sha256-ajuEbieWjTCNjdRZuGUwvStZwjx260jmY0m+ZqNd7ec="; - }; - - postPatch = '' - sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py - sed -i -e '/namespace_packages/d' setup.py - sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py - ''; - - propagatedBuildInputs = with python3Packages; [ mediafile ]; - - nativeCheckInputs = [ - python3Packages.pytestCheckHook - beets - ]; - - preCheck = '' - HOME="$(mktemp -d)" - ''; - - meta = { - homepage = "https://github.com/Holzhaus/beets-extrafiles"; - description = "Plugin for beets that copies additional files and directories during the import process"; - license = lib.licenses.mit; - inherit (beets.meta) platforms; - # Upstream hasn't had commits since 2020, build is broken since beets 2.0.0 - broken = true; - }; -} diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 1e3b85858294..5d5cf08c8974 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.8"; + version = "0.4.9"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1q4d136pvEWTOCY7Dv8Ux2HV9zqz5pWRhMrHKGLQ5ic="; + sha256 = "sha256-mjqlNUCEiP5dQS0a8HAejOJyEvY6jGFJFpVcnzU2Vds="; }; propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ]; diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 8b5dff5f5e33..7519d1f0109e 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.43"; + version = "4.00"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-GwE/E8GgVIeZtCefLNvacDUxI2C+Uf8zgpOQ1NpiSmM="; + hash = "sha256-fliiNeZPEP4uNMRDgG093fvU01ZTxwv08YLGwBooOLA="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 98c397cd4e2a..7494bc78ce20 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper perl ]; buildInputs = [ perl procps ]; postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index c94f94f55f2e..595882b9b500 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -2,7 +2,7 @@ , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit -, cups-filters, gettext, libtool, autoconf-archive +, libcupsfilters, gettext, libtool, autoconf-archive , python3Packages, autoreconfHook, bash, fetchpatch }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" + --set CUPS_DATADIR "${libcupsfilters}/share/cups" ) find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index e077ed9bb2be..fa98d818d59d 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "16.0.1"; + version = "16.0.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-/zSr6PEtfzLI/c32KrBlfHPja34T5DyiiR5a1/GDH/0="; + hash = "sha256-0wJxBFGPjJReWoeeKpHEsKaB3npR8nf7Uw8BgPQ+ccs="; }; - cargoHash = "sha256-ANmVdT0irhD3d6E4yNBOWqex3ApdfWgmQHxhGKsI4jA="; + cargoHash = "sha256-ac62RyjQujEYAOcoGOMlDlbx1MmVmrRKoNpgb3dFUFk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 43da147e06ec..027986a408f4 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGoModule +, buildGo122Module , makeWrapper , fetchFromGitHub , pythonPackages @@ -9,6 +9,7 @@ , systemd , hostname , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, withDocker ? true , extraTags ? [ ] , testers , datadog-agent @@ -16,17 +17,17 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "5.0.97"; + payloadVersion = "5.0.124"; python = pythonPackages.python; owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.50.3"; + version = "7.56.2"; src = fetchFromGitHub { inherit owner repo; rev = version; - hash = "sha256-AN5BruLPyrpIGSUkcYkZC0VgItk9NHiZTXstv6j9TlY="; + hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -37,19 +38,20 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGoModule rec { +in buildGo122Module rec { pname = "datadog-agent"; inherit src version; doCheck = false; - vendorHash = "sha256-Rn8EB/6FHQk9COlOaxm4TQXjGCIPZHJV2QQnPDcbRnM="; + vendorHash = if stdenv.isDarwin + then "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc=" + else "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw="; subPackages = [ "cmd/agent" "cmd/cluster-agent" "cmd/dogstatsd" - "cmd/py-launcher" "cmd/trace-agent" ]; @@ -67,6 +69,7 @@ in buildGoModule rec { "zlib" ] ++ lib.optionals withSystemd [ "systemd" ] + ++ lib.optionals withDocker [ "docker" ] ++ extraTags; ldflags = [ @@ -74,19 +77,17 @@ in buildGoModule rec { "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" "-X ${goPackagePath}/pkg/collector/python.pythonHome3=${python}" - "-X ${goPackagePath}/pkg/config.DefaultPython=3" + "-X ${goPackagePath}/pkg/config/setup.DefaultPython=3" "-r ${python}/lib" ]; - preBuild = '' - # Keep directories to generate in sync with tasks/go.py - go generate ./pkg/status ./cmd/agent/gui - ''; - # DataDog use paths relative to the agent binary, so fix these. + # We can't just point these to $out since that would introduce self-referential paths in the go modules, + # which are a fixed-output derivation. However, the patches aren't picked up if we skip them when building + # the modules. So we'll just traverse from the bin back to the out folder. postPatch = '' - sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ - -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ + sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \ + -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \ -i cmd/agent/common/path/path_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname/fqdn_nix.go @@ -97,11 +98,9 @@ in buildGoModule rec { postInstall = '' mkdir -p $out/${python.sitePackages} $out/share/datadog-agent cp -R --no-preserve=mode $src/cmd/agent/dist/conf.d $out/share/datadog-agent - rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d} + rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d,agentcrashdetect.d,myapp.d} cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/templates $out/share/datadog-agent - wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]}"; @@ -119,10 +118,5 @@ in buildGoModule rec { homepage = "https://www.datadoghq.com"; license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice domenkozar ]; - # never built on aarch64-darwin since first introduction in nixpkgs - # broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - - # Upstream does not support Go > 1.21; for update refer to https://github.com/NixOS/nixpkgs/issues/351119 - broken = true; }; } diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index 39f3eb9fda4e..003da2eee98a 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -33,27 +33,30 @@ # # [1]: https://github.com/DataDog/integrations-core -{ pkgs, python, extraIntegrations ? {} }: +{ lib, fetchFromGitHub, python3Packages, extraIntegrations ? { }, }: let - inherit (pkgs.lib) attrValues mapAttrs; + inherit (lib) attrValues mapAttrs; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "DataDog"; repo = "integrations-core"; rev = version; - sha256 = "sha256-CIzuJ97KwsG1k65Y+8IUSka/3JX1pmQKN3hPHzZnGhQ="; + sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk="; }; - version = "7.38.0"; + version = "7.56.2"; # Build helper to build a single datadog integration package. - buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // { - inherit src version; - name = "datadog-integration-${pname}-${version}"; + buildIntegration = { pname, ... }@args: + python3Packages.buildPythonPackage (args // { + inherit src version; + name = "datadog-integration-${pname}-${version}"; + pyproject = true; - sourceRoot = "${src.name}/${args.sourceRoot or pname}"; - doCheck = false; - }); + sourceRoot = "${src.name}/${args.sourceRoot or pname}"; + buildInputs = with python3Packages; [ hatchling setuptools ]; + doCheck = false; + }); # Base package depended on by all other integrations. datadog_checks_base = buildIntegration { @@ -67,7 +70,7 @@ let --replace "packages=['datadog_checks']" "packages=find_packages()" ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3Packages; [ binary cachetools cryptography @@ -107,10 +110,10 @@ let integrations = defaultIntegrations // extraIntegrations; builtIntegrations = mapAttrs (pname: fdeps: buildIntegration { inherit pname; - propagatedBuildInputs = (fdeps python.pkgs) ++ [ datadog_checks_base ]; + propagatedBuildInputs = (fdeps python3Packages) ++ [ datadog_checks_base ]; }) integrations; in builtIntegrations // { inherit datadog_checks_base; - python = python.withPackages (_: (attrValues builtIntegrations)); + python = python3Packages.python.withPackages (_: (attrValues builtIntegrations)); } diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 0ff8e600ff44..ecd5954fef0e 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.2.0"; + version = "1.5.1-flannel3"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-9AVXm3+VJFLQwe7EHwI8LmWKxfX1r0yjmKeaReQvxR4="; + sha256 = "sha256-uYjBRfcNop84pbFoXxFa73GzC6U5wMxix3fTRFn7FsM="; }; - vendorHash = "sha256-DhvaXC/n4yiVDibB8kymzltNhEIxKdTsEDN9Sfc/wxU="; + vendorHash = "sha256-ZBd7ngYfsmdSGHE9a0kiEB7SeYc9RfaU9MILK2r3cyg="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index fbc7ec0857b5..fa91b2c64dca 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -27,7 +27,7 @@ , openresolv , libndp , newt -, libsoup +, libsoup_2_4 , ethtool , gnused , iputils @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { modemmanager readline newt - libsoup + libsoup_2_4 jansson dbus # used to get directory paths with pkg-config during configuration ]; diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 2970b421fd5f..d39ddeda3ab2 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation { [ # Enable LTO, since it improves eval performance a fair amount # LTO is disabled on static due to strange linking errors - (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic)) + (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU)) (lib.mesonEnable "gc" true) (lib.mesonBool "enable-tests" true) (lib.mesonBool "enable-docs" enableDocumentation) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index a7b9bbad2d94..4903db23918f 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "auth"; - version = "2.163.2"; + version = "2.165.1"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-Y+A8uYC6FUmAgD4TMXShhknVdlmSZ5UwiqEfJUEpq6k="; + hash = "sha256-Tp8h20GM2YULlElFtHS41rFyWSIT3EGGXKtExkuO5P8="; }; - vendorHash = "sha256-Tg2X4vLuff5XTegDl4vrbvCycbuq4BgEq+O5FhWO+Ds="; + vendorHash = "sha256-w6qbqHHdXdDYHO5Asa0fkf0UBI7Wr2Voc2K4Ss1zDCE="; ldflags = [ "-s" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 026bbad72d20..f5d8760db83b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -389,6 +389,7 @@ mapAliases { flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 + fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 @@ -426,6 +427,7 @@ mapAliases { gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 + geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead."; gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 @@ -659,6 +661,7 @@ mapAliases { librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsForQt515 = libsForQt5; # Added 2022-11-24 + libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02 libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 @@ -861,7 +864,21 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - nerdfonts = throw "nerdfonts has been separated into individual font packages under the namespace nerd-fonts. To list all fonts use `builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)`."; # Added 2024-11-09 + nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts. + For example change: + fonts.packages = [ + ... + (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; }) + ] + to + fonts.packages = [ + ... + pkgs.nerd-fonts._0xproto + pkgs.nerd-fonts.droid_sans_mono + ] + or for all fonts + font.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts) + ''; # Added 2024-11-09 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nix-direnv-flakes = nix-direnv; @@ -1084,6 +1101,7 @@ mapAliases { ### R ### rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 + racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 radicale3 = radicale; # Added 2024-11-29 @@ -1394,6 +1412,7 @@ mapAliases { xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 + xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xulrunner = firefox-unwrapped; # Added 2023-11-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c370504ed57e..1cc4571ea3ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -282,9 +282,7 @@ with pkgs; chef-cli = callPackage ../tools/misc/chef-cli { }; - checkov = callPackage ../development/tools/analysis/checkov { - python3 = python311; - }; + checkov = callPackage ../development/tools/analysis/checkov { }; clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; @@ -2065,10 +2063,6 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - broot = callPackage ../tools/misc/broot { - inherit (darwin.apple_sdk.frameworks) Foundation Security; - }; - ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { }; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; @@ -3231,10 +3225,6 @@ with pkgs; schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - tealdeer = callPackage ../tools/misc/tealdeer { - inherit (darwin.apple_sdk.frameworks) Security; - }; - teamocil = callPackage ../tools/misc/teamocil { }; tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; @@ -5103,8 +5093,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) simd; }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; - rosenpass = callPackage ../tools/networking/rosenpass { }; rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; @@ -6871,9 +6859,6 @@ with pkgs; cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; - cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7533,9 +7518,6 @@ with pkgs; racket = callPackage ../development/interpreters/racket { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - racket_7_9 = callPackage ../development/interpreters/racket/racket_7_9.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo { }; @@ -9123,7 +9105,7 @@ with pkgs; geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; geocode-glib_2 = geocode-glib.override { - libsoup = libsoup_3; + libsoup_2_4 = libsoup_3; }; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { @@ -9137,8 +9119,6 @@ with pkgs; geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { }; - geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { }; - inherit (callPackages ../development/libraries/getdns { }) getdns stubby; @@ -10024,7 +10004,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; - libsoup = callPackage ../development/libraries/libsoup { }; + libsoup_2_4 = callPackage ../development/libraries/libsoup { }; libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; @@ -10705,6 +10685,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix {}); + rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; jvm = jre8; @@ -11053,6 +11035,7 @@ with pkgs; webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; + libsoup = libsoup_2_4; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (darwin) apple_sdk; }; @@ -13477,7 +13460,6 @@ with pkgs; }; datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { - python = python3; extraIntegrations = extras; }; @@ -14117,8 +14099,6 @@ with pkgs; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; - gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; @@ -15372,29 +15352,25 @@ with pkgs; keybinder3 = null; libappindicator-gtk3 = null; libmodplug = null; - libsoup = libsoup_3; }; quodlibet-without-gst-plugins = quodlibet.override { - libsoup = libsoup_3; tag = "-without-gst-plugins"; withGstPlugins = false; }; quodlibet-xine = quodlibet.override { - libsoup = libsoup_3; tag = "-xine"; withGstreamerBackend = false; withXineBackend = true; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk_4_0; + inherit gtksourceview; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; libmodplug = libmodplug; - libsoup = libsoup_3; tag = "-full"; withDbusPython = true; withMusicBrainzNgs = true; @@ -15404,7 +15380,6 @@ with pkgs; }; quodlibet-xine-full = quodlibet-full.override { - libsoup = libsoup_3; tag = "-xine-full"; withGstreamerBackend = false; withXineBackend = true; @@ -16243,10 +16218,6 @@ with pkgs; inherit (gnome2) libglade GConf; }; - xournal = callPackage ../applications/graphics/xournal { - inherit (gnome2) libgnomecanvas; - }; - xournalpp = darwin.apple_sdk_11_0.callPackage ../applications/graphics/xournalpp { lua = lua5_3; }; @@ -18552,10 +18523,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; - }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 3bd8248805d2..20e1d681a29b 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 ios-deploy = throw "'darwin.ios-deploy' has been renamed to 'ios-deploy'"; # added 2024-11-28 + iproute2mac = lib.warnOnInstantiate "darwin.iproute2mac has been renamed to iproute2mac" pkgs.iproute2mac; # added 2024-12-08 ### L ### diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 89e10d8b0ab0..b7c8644495a1 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -202,8 +202,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { inherit (pkgs.llvmPackages) clang-unwrapped; }; - iproute2mac = callPackage ../os-specific/darwin/iproute2mac { }; - lsusb = callPackage ../os-specific/darwin/lsusb { }; openwith = callPackage ../os-specific/darwin/openwith { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ececbd86ee3e..c0ce67d2df9b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -400,6 +400,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; + ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { + bootPkgs = + # For GHC 9.6 no armv7l bindists are available. + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 + else + bb.packages.ghc963Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; ghc98 = compiler.ghc982; # HLS doesn't work yet with 9.8.3 ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { bootPkgs = @@ -589,6 +607,11 @@ in { ghc = bh.compiler.ghc983; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; + ghc984 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc984; + ghc = bh.compiler.ghc984; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + }; ghc98 = packages.ghc982; # HLS doesn't work yet with 9.8.3 ghc9101 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9101; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 975a666524b4..4adf1b10a3ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18679,7 +18679,13 @@ with self; { url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz"; hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU="; }; - buildInputs = [ pkgs.cups pkgs.cups-filters ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/libnet-cups-perl/plain/debian/patches/cupsfilters-2.0.patch?id=a47b8df8551853c12a7f965ae60bb52333883c88"; + hash = "sha256-ouOrUsRHD1qxu8B6rZiqs9LXYIymX5kSuu99KnmP8Bo="; + }) + ]; + buildInputs = [ pkgs.cups pkgs.libcupsfilters ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups"; meta = { description = "Common Unix Printing System Interface"; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4c2286a47e90..60981baa69cf 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -578,7 +578,7 @@ }, "libsoup-gnome-2.4": { "attrPath": [ - "libsoup" + "libsoup_2_4" ] }, "libssh2": { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1eff1b03fab4..7c18c3d69dd2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -325,6 +325,7 @@ mapAliases ({ linear_operator = linear-operator; # added 2024-01-07 livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 + lmcloud = pylamarzocco; # added 2024-11-26 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8c4262a0289..64bcd45ff429 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7583,8 +7583,6 @@ self: super: with self; { lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { }; - lmcloud = callPackage ../development/python-modules/lmcloud { }; - lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; }; @@ -11838,6 +11836,8 @@ self: super: with self; { pylama = callPackage ../development/python-modules/pylama { }; + pylamarzocco = callPackage ../development/python-modules/pylamarzocco { }; + pylast = callPackage ../development/python-modules/pylast { }; pylatex = callPackage ../development/python-modules/pylatex { }; @@ -16069,9 +16069,7 @@ self: super: with self; { token-bucket = callPackage ../development/python-modules/token-bucket { }; - tokenizers = callPackage ../development/python-modules/tokenizers { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; - }; + tokenizers = callPackage ../development/python-modules/tokenizers { }; tokenize-rt = callPackage ../development/python-modules/tokenize-rt { }; @@ -17265,6 +17263,10 @@ self: super: with self; { ua-parser = callPackage ../development/python-modules/ua-parser { }; + ua-parser-builtins = callPackage ../development/python-modules/ua-parser-builtins { }; + + ua-parser-rs = callPackage ../development/python-modules/ua-parser-rs { }; + uarray = callPackage ../development/python-modules/uarray { }; uart-devices = callPackage ../development/python-modules/uart-devices { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7df396f4327f..4ba7c60ad29a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -76,6 +76,7 @@ let ghc981 ghc982 ghc983 + ghc984 ghc9101 ]; @@ -466,8 +467,8 @@ let ; }; - haskell.packages.native-bignum.ghc983 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc983) + haskell.packages.native-bignum.ghc984 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc984) hello random QuickCheck @@ -721,7 +722,7 @@ let constituents = accumulateDerivations [ jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc983 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc984 ]; }; }