diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
commit | 34b58aaefccdb5c64b912903973ba729bae58be3 (patch) | |
tree | e18a96bc0f066422356a8da655453403baa97e64 /nixpkgs | |
parent | 7be318098d7fe87d896e8787bfadc0345149cb59 (diff) | |
parent | 3fb937a1e9f4157f57011965b99fcb7f4139d9ad (diff) | |
download | nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.gz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.bz2 nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.lz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.xz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.zst nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs')
225 files changed, 8034 insertions, 5198 deletions
diff --git a/nixpkgs/doc/functions.md b/nixpkgs/doc/functions.md index 551ba522a904..09033c9e3c19 100644 --- a/nixpkgs/doc/functions.md +++ b/nixpkgs/doc/functions.md @@ -8,5 +8,4 @@ functions/generators.section.md functions/debug.section.md functions/prefer-remote-fetch.section.md functions/nix-gitignore.section.md -functions/fileset.section.md ``` diff --git a/nixpkgs/doc/functions/fileset.section.md b/nixpkgs/doc/functions/fileset.section.md deleted file mode 100644 index c42337feaba4..000000000000 --- a/nixpkgs/doc/functions/fileset.section.md +++ /dev/null @@ -1,48 +0,0 @@ -<!-- TODO: Render this document in front of function documentation in case https://github.com/nix-community/nixdoc/issues/19 is ever supported --> - -# File sets {#sec-fileset} - -The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. -A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. -File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. - -See the [function reference](#sec-functions-library-fileset) for function-specific documentation. - -## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} - -All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. -Such path arguments are implicitly coerced to file sets containing all files under that path: -- A path to a file turns into a file set containing that single file. -- A path to a directory turns into a file set containing all files _recursively_ in that directory. - -If the path points to a non-existent location, an error is thrown. - -::: {.note} -Just like in Git, file sets cannot represent empty directories. -Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. -::: - -:::{.note} -File set coercion does _not_ add any of the files under the coerced paths to the store. -Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. -This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. -::: - -### Example {#sec-fileset-path-coercion-example} - -Assume we are in a local directory with a file hierarchy like this: -``` -├─ a/ -│ ├─ x (file) -│ └─ b/ -│ └─ y (file) -└─ c/ - └─ d/ -``` - -Here's a listing of which files get included when different path expressions get coerced to file sets: -- `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). -- `./a` as a file set contains both `a/x` and `a/b/y`. -- `./a/x` as a file set contains only `a/x`. -- `./a/b` as a file set contains only `a/b/y`. -- `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. diff --git a/nixpkgs/doc/stdenv/stdenv.chapter.md b/nixpkgs/doc/stdenv/stdenv.chapter.md index 26c43bd9e943..03bb8a9ff790 100644 --- a/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -119,13 +119,18 @@ phases="${prePhases[*]:-} unpackPhase patchPhase" genericBuild ``` Then, run more phases up until the failure is reached. -For example, if the failure is in the build phase, the following phases would be required: +If the failure is in the build or check phase, the following phases would be required: ```bash -phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase" genericBuild +phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase" genericBuild ``` -Re-run a single phase as many times as necessary to examine the failure like so: +Use this command to run all install phases: +```bash +phases="${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase" genericBuild +``` + +Single phase can be re-run as many times as necessary to examine the failure like so: ```bash phases="buildPhase" genericBuild diff --git a/nixpkgs/lib/fileset/default.nix b/nixpkgs/lib/fileset/default.nix index 15af0813eec7..ca2ab9a35740 100644 --- a/nixpkgs/lib/fileset/default.nix +++ b/nixpkgs/lib/fileset/default.nix @@ -1,3 +1,52 @@ +/* + <!-- This anchor is here for backwards compatibity --> + []{#sec-fileset} + + The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. + A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. + File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. + + See the [function reference](#sec-functions-library-fileset) for function-specific documentation. + + ## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} + + All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. + Such path arguments are implicitly coerced to file sets containing all files under that path: + - A path to a file turns into a file set containing that single file. + - A path to a directory turns into a file set containing all files _recursively_ in that directory. + + If the path points to a non-existent location, an error is thrown. + + ::: {.note} + Just like in Git, file sets cannot represent empty directories. + Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. + ::: + + :::{.note} + File set coercion does _not_ add any of the files under the coerced paths to the store. + Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. + This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. + ::: + + ### Example {#sec-fileset-path-coercion-example} + + Assume we are in a local directory with a file hierarchy like this: + ``` + ├─ a/ + │ ├─ x (file) + │ └─ b/ + │ └─ y (file) + └─ c/ + └─ d/ + ``` + + Here's a listing of which files get included when different path expressions get coerced to file sets: + - `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). + - `./a` as a file set contains both `a/x` and `a/b/y`. + - `./a/x` as a file set contains only `a/x`. + - `./a/b` as a file set contains only `a/b/y`. + - `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. +*/ { lib }: let @@ -263,7 +312,7 @@ in { lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' else if ! pathExists path then throw '' - lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.'' + lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' else if isFiltered then _fromSourceFilter path source.filter else diff --git a/nixpkgs/lib/fileset/internal.nix b/nixpkgs/lib/fileset/internal.nix index 0769e654c8fb..23d7b847204c 100644 --- a/nixpkgs/lib/fileset/internal.nix +++ b/nixpkgs/lib/fileset/internal.nix @@ -381,7 +381,7 @@ rec { # Turn a fileset into a source filter function suitable for `builtins.path` # Only directories recursively containing at least one files are recursed into - # Type: Path -> fileset -> (String -> String -> Bool) + # Type: fileset -> (String -> String -> Bool) _toSourceFilter = fileset: let # Simplify the tree, necessary to make sure all empty directories are null @@ -753,9 +753,9 @@ rec { resultingTree = _differenceTree - positive._internalBase - positive._internalTree - negativeTreeWithPositiveBase; + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; in # If the first file set is empty, we can never have any files in the result if positive._internalIsEmptyWithoutBase then diff --git a/nixpkgs/lib/fileset/tests.sh b/nixpkgs/lib/fileset/tests.sh index 3c88ebdd0559..06f92f297d88 100755 --- a/nixpkgs/lib/fileset/tests.sh +++ b/nixpkgs/lib/fileset/tests.sh @@ -1064,13 +1064,18 @@ rm -rf -- * ## lib.fileset.fromSource # Check error messages -expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# String-like values are not supported expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead. \s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' +# Wrong type +expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# fromSource on non-existent paths gives an error +expectFailure 'fromSource ./a' 'lib.fileset.fromSource: The source origin \('"$work"'/a\) of the argument is a path that does not exist.' + # fromSource on a path works and is the same as coercing that path mkdir a touch a/b c diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 5df00f2371f4..3e2bc9229903 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -2883,6 +2883,13 @@ githubId = 686190; name = "Carlos D'Agostino"; }; + carlossless = { + email = "contact@carlossless.io"; + matrix = "@carlossless:matrix.org"; + github = "carlossless"; + githubId = 498906; + name = "Karolis Stasaitis"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; @@ -4225,6 +4232,15 @@ githubId = 156239; name = "D Anzorge"; }; + defelo = { + name = "Defelo"; + matrix = "@defelo:matrix.defelo.de"; + github = "Defelo"; + githubId = 41747605; + keys = [{ + fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; + }]; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; @@ -16263,6 +16279,13 @@ githubId = 75371; name = "Stig Palmquist"; }; + sg-qwt = { + email = "hello@edgerunners.eu.org"; + matrix = "@dhl:edgerunners.eu.org"; + github = "sg-qwt"; + name = "sg-qwt"; + githubId = 115715554; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index b6519d17b9a4..9f79c70125fc 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -800,6 +800,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/ocsinventory-agent.nix ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix diff --git a/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix index 0be79e759c31..02e44c73d87a 100644 --- a/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -33,19 +33,22 @@ in { }; config = mkIf cfg.enable { + # See https://github.com/aws/amazon-ssm-agent/blob/mainline/packaging/linux/amazon-ssm-agent.service systemd.services.amazon-ssm-agent = { inherit (cfg.package.meta) description; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = [ fake-lsb-release pkgs.coreutils ]; + serviceConfig = { ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; KillMode = "process"; # We want this restating pretty frequently. It could be our only means # of accessing the instance. Restart = "always"; - RestartSec = "1min"; + RestartPreventExitStatus = 194; + RestartSec = "90"; }; }; @@ -70,7 +73,7 @@ in { group = "ssm-user"; }; - environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template"; + environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/etc/amazon/ssm/seelog.xml.template"; environment.etc."amazon/ssm/amazon-ssm-agent.json".source = "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template"; diff --git a/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.md b/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.md new file mode 100644 index 000000000000..50e246fb6531 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.md @@ -0,0 +1,33 @@ +# OCS Inventory Agent {#module-services-ocsinventory-agent} + +[OCS Inventory NG](https://ocsinventory-ng.org/) or Open Computers and Software inventory +is an application designed to help IT administrator to keep track of the hardware and software +configurations of computers that are installed on their network. + +OCS Inventory collects information about the hardware and software of networked machines +through the **OCS Inventory Agent** program. + +This NixOS module enables you to install and configure this agent so that it sends information from your computer to the OCS Inventory server. + +For more technical information about OCS Inventory Agent, refer to [the Wiki documentation](https://wiki.ocsinventory-ng.org/03.Basic-documentation/Setting-up-the-UNIX-agent-manually-on-client-computers/). + + +## Basic Usage {#module-services-ocsinventory-agent-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.ocsinventory-agent = { + enable = true; + settings = { + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + }; +} +``` + +This configuration will periodically run the ocsinventory-agent SystemD service. + +The OCS Inventory Agent will inventory the computer and then sends the results to the specified OCS Inventory Server. diff --git a/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.nix b/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.nix new file mode 100644 index 000000000000..7585ae863750 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/ocsinventory-agent.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.ocsinventory-agent; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } "="; + }; + +in +{ + meta = { + doc = ./ocsinventory-agent.md; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; + + options = { + services.ocsinventory-agent = { + enable = lib.mkEnableOption (lib.mdDoc "OCS Inventory Agent"); + + package = lib.mkPackageOptionMD pkgs "ocsinventory-agent" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + server = lib.mkOption { + type = lib.types.nullOr lib.types.str; + example = "https://ocsinventory.localhost:8080/ocsinventory"; + default = null; + description = lib.mdDoc '' + The URI of the OCS Inventory server where to send the inventory file. + + This option is ignored if {option}`services.ocsinventory-agent.settings.local` is set. + ''; + }; + + local = lib.mkOption { + type = lib.types.nullOr lib.types.path; + example = "/var/lib/ocsinventory-agent/reports"; + default = null; + description = lib.mdDoc '' + If specified, the OCS Inventory Agent will run in offline mode + and the resulting inventory file will be stored in the specified path. + ''; + }; + + ca = lib.mkOption { + type = lib.types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = lib.mdDoc '' + Path to CA certificates file in PEM format, for server + SSL certificate validation. + ''; + }; + + tag = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "01234567890123"; + description = lib.mdDoc "Tag for the generated inventory."; + }; + + debug = lib.mkEnableOption (lib.mdDoc "debug mode"); + }; + }; + default = { }; + example = { + ca = "/etc/ssl/certs/ca-certificates.crt"; + debug = true; + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + description = lib.mdDoc '' + Configuration for /etc/ocsinventory-agent/ocsinventory-agent.cfg. + + Refer to + {manpage}`ocsinventory-agent(1)` for available options. + ''; + }; + + interval = lib.mkOption { + type = lib.types.str; + default = "daily"; + example = "06:00"; + description = lib.mdDoc '' + How often we run the ocsinventory-agent service. Runs by default every daily. + + The format is described in + {manpage}`systemd.time(7)`. + ''; + }; + }; + }; + + config = + let + configFile = settingsFormat.generate "ocsinventory-agent.cfg" cfg.settings; + + in lib.mkIf cfg.enable { + # Path of the configuration file is hard-coded and cannot be changed + # https://github.com/OCSInventory-NG/UnixAgent/blob/v2.10.0/lib/Ocsinventory/Agent/Config.pm#L78 + # + environment.etc."ocsinventory-agent/ocsinventory-agent.cfg".source = configFile; + + systemd.services.ocsinventory-agent = { + description = "OCS Inventory Agent service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + reloadTriggers = [ configFile ]; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + ConfigurationDirectory = "ocsinventory-agent"; + StateDirectory = "ocsinventory-agent"; + }; + }; + + systemd.timers.ocsinventory-agent = { + description = "Launch OCS Inventory Agent regularly"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = cfg.interval; + AccuracySec = "1h"; + RandomizedDelaySec = 240; + Persistent = true; + Unit = "ocsinventory-agent.service"; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/nixpkgs/nixos/modules/services/monitoring/thanos.nix index e6d8afc66624..db8641aa6146 100644 --- a/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -1,14 +1,37 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + collect + concatLists + concatStringsSep + flip + getAttrFromPath + hasPrefix + isList + length + literalExpression + literalMD + mapAttrsRecursiveCond + mapAttrsToList + mdDoc + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOptionMD + optional + optionalAttrs + optionalString + types + ; + cfg = config.services.thanos; nullOpt = type: description: mkOption { type = types.nullOr type; default = null; - description = lib.mdDoc description; + description = mdDoc description; }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; @@ -32,7 +55,7 @@ let option = mkOption { type = types.bool; default = false; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -41,7 +64,7 @@ let option = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -50,7 +73,7 @@ let option = mkOption { type = types.attrsOf types.str; default = {}; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -59,7 +82,7 @@ let option = mkOption { type = types.str; inherit default; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -86,7 +109,7 @@ let defaultText = literalMD '' calculated from `config.services.thanos.${cmd}` ''; - description = lib.mdDoc '' + description = mdDoc '' Arguments to the `thanos ${cmd}` command. Defaults to a list of arguments formed by converting the structured @@ -127,10 +150,10 @@ let if config.services.thanos.<cmd>.tracing.config == null then null else toString (toYAML "tracing.yaml" config.services.thanos.<cmd>.tracing.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains tracing configuration. - See format details: <https://thanos.io/tracing.md/#configuration> + See format details: <https://thanos.io/tip/thanos/tracing.md/#configuration> ''; }; }; @@ -147,7 +170,7 @@ let If {option}`tracing.config-file` is set this option has no effect. - See format details: <https://thanos.io/tracing.md/#configuration> + See format details: <https://thanos.io/tip/thanos/tracing.md/#configuration> ''; }; }; @@ -192,10 +215,10 @@ let if config.services.thanos.<cmd>.objstore.config == null then null else toString (toYAML "objstore.yaml" config.services.thanos.<cmd>.objstore.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains object store configuration. - See format details: <https://thanos.io/storage.md/#configuration> + See format details: <https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage> ''; }; }; @@ -212,7 +235,7 @@ let If {option}`objstore.config-file` is set this option has no effect. - See format details: <https://thanos.io/storage.md/#configuration> + See format details: <https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage> ''; }; }; @@ -231,7 +254,7 @@ let type = types.str; default = "/var/lib/${config.services.prometheus.stateDir}/data"; defaultText = literalExpression ''"/var/lib/''${config.services.prometheus.stateDir}/data"''; - description = lib.mdDoc '' + description = mdDoc '' Data directory of TSDB. ''; }; @@ -266,14 +289,14 @@ let Maximum size of concurrently allocatable bytes for chunks. ''; - store.grpc.series-sample-limit = mkParamDef types.int 0 '' - Maximum amount of samples returned via a single Series call. + store.limits.request-samples = mkParamDef types.int 0 '' + The maximum samples allowed for a single Series request. + The Series call fails if this limit is exceeded. `0` means no limit. - NOTE: for efficiency we take 120 as the number of samples in chunk (it - cannot be bigger than that), so the actual number of samples might be - lower, even though the maximum could be hit. + NOTE: For efficiency the limit is internally implemented as 'chunks limit' + considering each chunk contains a maximum of 120 samples. ''; store.grpc.series-max-concurrency = mkParamDef types.int 20 '' @@ -371,24 +394,25 @@ let Maximum number of queries processed concurrently by query node. ''; - query.replica-label = mkParam types.str '' - Label to treat as a replica indicator along which data is + query.replica-labels = mkAttrsParam "query.replica-label" '' + Labels to treat as a replica indicator along which data is + deduplicated. Still you will be able to query without deduplication using - `dedup=false` parameter. + 'dedup=false' parameter. Data includes time series, recording + rules, and alerting rules. ''; selector-labels = mkAttrsParam "selector-label" '' Query selector labels that will be exposed in info endpoint. ''; - store.addresses = mkListParam "store" '' - Addresses of statically configured store API servers. + endpoints = mkListParam "endpoint" '' + Addresses of statically configured Thanos API servers (repeatable). - The scheme may be prefixed with `dns+` or - `dnssrv+` to detect store API servers through - respective DNS lookups. + The scheme may be prefixed with 'dns+' or 'dnssrv+' to detect + Thanos API servers through respective DNS lookups. ''; store.sd-files = mkListParam "store.sd-files" '' @@ -430,6 +454,12 @@ let ''; }; + query-frontend = params.common cfg.query-frontend // { + query-frontend.downstream-url = mkParamDef types.str "http://localhost:9090" '' + URL of downstream Prometheus Query compatible API. + ''; + }; + rule = params.common cfg.rule // params.objstore cfg.rule // { labels = mkAttrsParam "label" '' @@ -447,7 +477,7 @@ let Rule files that should be used by rule manager. Can be in glob format. ''; - eval-interval = mkParamDef types.str "30s" '' + eval-interval = mkParamDef types.str "1m" '' The default evaluation interval to use. ''; @@ -597,10 +627,6 @@ let to render all samples for a human eye anyway ''; - block-sync-concurrency = mkParamDef types.int 20 '' - Number of goroutines to use when syncing block metadata from object storage. - ''; - compact.concurrency = mkParamDef types.int 1 '' Number of goroutines to use when compacting groups. ''; @@ -625,7 +651,7 @@ let Data directory relative to `/var/lib` of TSDB. ''; - labels = mkAttrsParam "labels" '' + labels = mkAttrsParam "label" '' External labels to announce. This flag will be removed in the future when handling multiple tsdb @@ -656,57 +682,56 @@ in { options.services.thanos = { - package = mkOption { - type = types.package; - default = pkgs.thanos; - defaultText = literalExpression "pkgs.thanos"; - description = lib.mdDoc '' - The thanos package that should be used. - ''; - }; + package = mkPackageOptionMD pkgs "thanos" {}; sidecar = paramsToOptions params.sidecar // { enable = mkEnableOption - (lib.mdDoc "the Thanos sidecar for Prometheus server"); + (mdDoc "the Thanos sidecar for Prometheus server"); arguments = mkArgumentsOption "sidecar"; }; store = paramsToOptions params.store // { enable = mkEnableOption - (lib.mdDoc "the Thanos store node giving access to blocks in a bucket provider."); + (mdDoc "the Thanos store node giving access to blocks in a bucket provider."); arguments = mkArgumentsOption "store"; }; query = paramsToOptions params.query // { enable = mkEnableOption - (lib.mdDoc ("the Thanos query node exposing PromQL enabled Query API " + + (mdDoc ("the Thanos query node exposing PromQL enabled Query API " + "with data retrieved from multiple store nodes")); arguments = mkArgumentsOption "query"; }; + query-frontend = paramsToOptions params.query-frontend // { + enable = mkEnableOption + (mdDoc ("the Thanos query frontend implements a service deployed in front of queriers to + improve query parallelization and caching.")); + arguments = mkArgumentsOption "query-frontend"; + }; + rule = paramsToOptions params.rule // { enable = mkEnableOption - (lib.mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + + (mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + " given Query nodes, exposing Store API and storing old blocks in bucket")); arguments = mkArgumentsOption "rule"; }; compact = paramsToOptions params.compact // { enable = mkEnableOption - (lib.mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); + (mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); arguments = mkArgumentsOption "compact"; }; downsample = paramsToOptions params.downsample // { enable = mkEnableOption - (lib.mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); + (mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); arguments = mkArgumentsOption "downsample"; }; receive = paramsToOptions params.receive // { enable = mkEnableOption - (lib.mdDoc ("the Thanos receiver which accept Prometheus remote write API requests " + - "and write to local tsdb (EXPERIMENTAL, this may change drastically without notice)")); + (mdDoc ("the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb")); arguments = mkArgumentsOption "receive"; }; }; @@ -736,6 +761,7 @@ in { User = "prometheus"; Restart = "always"; ExecStart = thanos "sidecar"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -751,6 +777,7 @@ in { StateDirectory = cfg.store.stateDir; Restart = "always"; ExecStart = thanos "store"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -764,6 +791,20 @@ in { DynamicUser = true; Restart = "always"; ExecStart = thanos "query"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }) + + (mkIf cfg.query-frontend.enable { + systemd.services.thanos-query-frontend = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = thanos "query-frontend"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -779,6 +820,7 @@ in { StateDirectory = cfg.rule.stateDir; Restart = "always"; ExecStart = thanos "rule"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -797,6 +839,7 @@ in { DynamicUser = true; StateDirectory = cfg.compact.stateDir; ExecStart = thanos "compact"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; } // optionalAttrs (!wait) { inherit (cfg.compact) startAt; }; } @@ -813,6 +856,7 @@ in { StateDirectory = cfg.downsample.stateDir; Restart = "always"; ExecStart = thanos "downsample"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -829,6 +873,7 @@ in { StateDirectory = cfg.receive.stateDir; Restart = "always"; ExecStart = thanos "receive"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } diff --git a/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index d370e6946d7b..3f10145033c5 100644 --- a/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -162,7 +162,7 @@ in }; extraFlags = mkOption { - default = []; + default = [ ]; example = [ "-s" ]; type = types.listOf types.str; description = lib.mdDoc "Extra flags passed to the chronyd command."; @@ -178,7 +178,8 @@ in users.groups.chrony.gid = config.ids.gids.chrony; users.users.chrony = - { uid = config.ids.uids.chrony; + { + uid = config.ids.uids.chrony; group = "chrony"; description = "chrony daemon user"; home = stateDir; @@ -202,12 +203,13 @@ in ]; systemd.services.chronyd = - { description = "chrony NTP daemon"; + { + description = "chrony NTP daemon"; wantedBy = [ "multi-user.target" ]; - wants = [ "time-sync.target" ]; - before = [ "time-sync.target" ]; - after = [ "network.target" "nss-lookup.target" ]; + wants = [ "time-sync.target" ]; + before = [ "time-sync.target" ]; + after = [ "network.target" "nss-lookup.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; path = [ chronyPkg ]; @@ -255,5 +257,18 @@ in SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "@chown" ]; }; }; + + assertions = [ + { + assertion = !(cfg.enableRTCTrimming && builtins.any (line: (builtins.match "^ *rtcsync" line) != null) (lib.strings.splitString "\n" cfg.extraConfig)); + message = '' + The chrony module now configures `rtcfile` and `rtcautotrim` for you. + These options conflict with `rtcsync` and cause chrony to crash. + Unless you are very sure the former isn't what you want, please remove + `rtcsync` from `services.chrony.extraConfig`. + Alternatively, disable this behaviour by `services.chrony.enableRTCTrimming = false;` + ''; + } + ]; }; } diff --git a/nixpkgs/nixos/modules/services/networking/pixiecore.nix b/nixpkgs/nixos/modules/services/networking/pixiecore.nix index f410be471646..1f47a1d0b631 100644 --- a/nixpkgs/nixos/modules/services/networking/pixiecore.nix +++ b/nixpkgs/nixos/modules/services/networking/pixiecore.nix @@ -16,7 +16,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. + Open ports (67, 69, 4011 UDP and 'port', 'statusPort' TCP) in the firewall for Pixiecore. ''; }; @@ -103,8 +103,8 @@ in }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 4011 cfg.port cfg.statusPort ]; - allowedUDPPorts = [ 67 69 ]; + allowedTCPPorts = [ cfg.port cfg.statusPort ]; + allowedUDPPorts = [ 67 69 4011 ]; }; systemd.services.pixiecore = { diff --git a/nixpkgs/nixos/modules/services/networking/squid.nix b/nixpkgs/nixos/modules/services/networking/squid.nix index 914cd7f320c9..f93bcf19f2b3 100644 --- a/nixpkgs/nixos/modules/services/networking/squid.nix +++ b/nixpkgs/nixos/modules/services/networking/squid.nix @@ -176,7 +176,7 @@ in serviceConfig = { PIDFile="/run/squid.pid"; ExecStart = "${cfg.package}/bin/squid --foreground -YCs -f ${squidConfig}"; - ExecReload="kill -HUP $MAINPID"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillMode="mixed"; NotifyAccess="all"; }; diff --git a/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index ce74e243a181..dcacb40e4681 100644 --- a/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -376,7 +376,9 @@ in ReadWriteDirectories = cfg.dataDir; StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ]; LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; - Restart = "on-abnormal"; + Restart = "on-failure"; + RestartPreventExitStatus = 1; + RestartSecs = "5s"; # TODO: attempt to upstream these options NoNewPrivileges = true; diff --git a/nixpkgs/nixos/modules/services/web-servers/tomcat.nix b/nixpkgs/nixos/modules/services/web-servers/tomcat.nix index 4d2c36287be6..30d6b99fcfda 100644 --- a/nixpkgs/nixos/modules/services/web-servers/tomcat.nix +++ b/nixpkgs/nixos/modules/services/web-servers/tomcat.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.tomcat; @@ -9,30 +7,20 @@ let in { - meta = { - maintainers = with maintainers; [ danbst ]; + maintainers = with lib.maintainers; [ danbst ]; }; ###### interface options = { - services.tomcat = { - enable = mkEnableOption (lib.mdDoc "Apache Tomcat"); + enable = lib.mkEnableOption (lib.mdDoc "Apache Tomcat"); - package = mkOption { - type = types.package; - default = pkgs.tomcat9; - defaultText = literalExpression "pkgs.tomcat9"; - example = lib.literalExpression "pkgs.tomcat9"; - description = lib.mdDoc '' - Which tomcat package to use. - ''; - }; + package = lib.mkPackageOptionMD pkgs "tomcat9" { }; - purifyOnStart = mkOption { - type = types.bool; + purifyOnStart = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' On startup, the `baseDir` directory is populated with various files, @@ -43,7 +31,7 @@ in ''; }; - baseDir = mkOption { + baseDir = lib.mkOption { type = lib.types.path; default = "/var/tomcat"; description = lib.mdDoc '' @@ -53,64 +41,64 @@ in ''; }; - logDirs = mkOption { - default = []; - type = types.listOf types.path; + logDirs = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.path; description = lib.mdDoc "Directories to create in baseDir/logs/"; }; - extraConfigFiles = mkOption { - default = []; - type = types.listOf types.path; + extraConfigFiles = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.path; description = lib.mdDoc "Extra configuration files to pull into the tomcat conf directory"; }; - extraEnvironment = mkOption { - type = types.listOf types.str; - default = []; + extraEnvironment = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; example = [ "ENVIRONMENT=production" ]; description = lib.mdDoc "Environment Variables to pass to the tomcat service"; }; - extraGroups = mkOption { - default = []; - type = types.listOf types.str; + extraGroups = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.str; example = [ "users" ]; description = lib.mdDoc "Defines extra groups to which the tomcat user belongs."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "tomcat"; description = lib.mdDoc "User account under which Apache Tomcat runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "tomcat"; description = lib.mdDoc "Group account under which Apache Tomcat runs."; }; - javaOpts = mkOption { - type = types.either (types.listOf types.str) types.str; + javaOpts = lib.mkOption { + type = lib.types.either (lib.types.listOf lib.types.str) lib.types.str; default = ""; description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; }; - catalinaOpts = mkOption { - type = types.either (types.listOf types.str) types.str; + catalinaOpts = lib.mkOption { + type = lib.types.either (lib.types.listOf lib.types.str) lib.types.str; default = ""; description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container"; }; - sharedLibs = mkOption { - type = types.listOf types.str; - default = []; + sharedLibs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications"; }; - serverXml = mkOption { - type = types.lines; + serverXml = lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' Verbatim server.xml configuration. @@ -118,87 +106,74 @@ in ''; }; - commonLibs = mkOption { - type = types.listOf types.str; - default = []; + commonLibs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container"; }; - webapps = mkOption { - type = types.listOf types.path; + webapps = lib.mkOption { + type = lib.types.listOf lib.types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; + defaultText = lib.literalExpression "[ config.services.tomcat.package.webapps ]"; description = lib.mdDoc "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; - virtualHosts = mkOption { - type = types.listOf (types.submodule { + virtualHosts = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = lib.mdDoc "name of the virtualhost"; }; - aliases = mkOption { - type = types.listOf types.str; + aliases = lib.mkOption { + type = lib.types.listOf lib.types.str; description = lib.mdDoc "aliases of the virtualhost"; - default = []; + default = [ ]; }; - webapps = mkOption { - type = types.listOf types.path; + webapps = lib.mkOption { + type = lib.types.listOf lib.types.path; description = lib.mdDoc '' List containing web application WAR files and/or directories containing web applications and configuration files for the virtual host. ''; - default = []; + default = [ ]; }; }; }); - default = []; + default = [ ]; description = lib.mdDoc "List consisting of a virtual host name and a list of web applications to deploy on each virtual host"; }; - logPerVirtualHost = mkOption { - type = types.bool; + logPerVirtualHost = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc "Whether to enable logging per virtual host."; }; - jdk = mkOption { - type = types.package; - default = pkgs.jdk; - defaultText = literalExpression "pkgs.jdk"; - description = lib.mdDoc "Which JDK to use."; - }; + jdk = lib.mkPackageOptionMD pkgs "jdk" { }; axis2 = { + enable = lib.mkEnableOption "Apache Axis2 container"; - enable = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc "Whether to enable an Apache Axis2 container"; - }; - - services = mkOption { - default = []; - type = types.listOf types.str; + services = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.str; description = lib.mdDoc "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; }; - }; - }; - }; - ###### implementation - config = mkIf config.services.tomcat.enable { + config = lib.mkIf config.services.tomcat.enable { users.groups.tomcat.gid = config.ids.gids.tomcat; users.users.tomcat = - { uid = config.ids.uids.tomcat; + { + uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; group = "tomcat"; @@ -234,7 +209,7 @@ in ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i` done - ${optionalString (cfg.extraConfigFiles != []) '' + ${lib.optionalString (cfg.extraConfigFiles != []) '' for i in ${toString cfg.extraConfigFiles}; do ln -sfn $i ${cfg.baseDir}/conf/`basename $i` done @@ -253,32 +228,32 @@ in hostElementForVirtualHost = virtualHost: '' <Host name="${virtualHost.name}" appBase="virtualhosts/${virtualHost.name}/webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - '' + concatStrings (innerElementsForVirtualHost virtualHost) + '' + '' + lib.concatStrings (innerElementsForVirtualHost virtualHost) + '' </Host> ''; innerElementsForVirtualHost = virtualHost: (map (alias: '' <Alias>${alias}</Alias> '') virtualHost.aliases) - ++ (optional cfg.logPerVirtualHost '' + ++ (lib.optional cfg.logPerVirtualHost '' <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs/${virtualHost.name}" prefix="${virtualHost.name}_access_log." pattern="combined" resolveHosts="false"/> ''); - hostElementsString = concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; - hostElementsSedString = replaceStrings ["\n"] ["\\\n"] hostElementsString; + hostElementsString = lib.concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; + hostElementsSedString = lib.replaceStrings ["\n"] ["\\\n"] hostElementsString; in '' # Create a modified server.xml which also includes all virtual hosts - sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${escapeShellArg hostElementsSedString} \ + sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${lib.escapeShellArg hostElementsSedString} \ ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml '' } - ${optionalString (cfg.logDirs != []) '' + ${lib.optionalString (cfg.logDirs != []) '' for i in ${toString cfg.logDirs}; do mkdir -p ${cfg.baseDir}/logs/$i chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i done ''} - ${optionalString cfg.logPerVirtualHost (toString (map (h: '' + ${lib.optionalString cfg.logPerVirtualHost (toString (map (h: '' mkdir -p ${cfg.baseDir}/logs/${h.name} chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name} '') cfg.virtualHosts))} @@ -345,7 +320,7 @@ in # Symlink all the given web applications files or paths into the webapps/ directory # of this virtual host - for i in "${optionalString (virtualHost ? webapps) (toString virtualHost.webapps)}"; do + for i in "${lib.optionalString (virtualHost ? webapps) (toString virtualHost.webapps)}"; do if [ -f $i ]; then # If the given web application is a file, symlink it into the webapps/ directory ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i` @@ -368,7 +343,7 @@ in done '') cfg.virtualHosts)} - ${optionalString cfg.axis2.enable '' + ${lib.optionalString cfg.axis2.enable '' # Copy the Axis2 web application cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps @@ -405,10 +380,10 @@ in serviceConfig = { Type = "forking"; PermissionsStartOnly = true; - PIDFile="/run/tomcat/tomcat.pid"; + PIDFile = "/run/tomcat/tomcat.pid"; RuntimeDirectory = "tomcat"; User = cfg.user; - Environment=[ + Environment = [ "CATALINA_BASE=${cfg.baseDir}" "CATALINA_PID=/run/tomcat/tomcat.pid" "JAVA_HOME='${cfg.jdk}'" diff --git a/nixpkgs/nixos/modules/system/boot/stage-1.nix b/nixpkgs/nixos/modules/system/boot/stage-1.nix index 13c71e1495ea..e990aeea7a14 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -435,7 +435,7 @@ let } # mindepth 1 so that we don't change the mode of / - (cd "$tmp" && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ + (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1" ''; diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 325e99c97749..367e3da29336 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -117,6 +117,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {}; amd-sev = runTest ./amd-sev.nix; anbox = runTest ./anbox.nix; anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; @@ -616,6 +617,7 @@ in { openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; opentelemetry-collector = handleTest ./opentelemetry-collector.nix {}; + ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix {}; owncast = handleTest ./owncast.nix {}; outline = handleTest ./outline.nix {}; image-contents = handleTest ./image-contents.nix {}; diff --git a/nixpkgs/nixos/tests/amazon-ssm-agent.nix b/nixpkgs/nixos/tests/amazon-ssm-agent.nix new file mode 100644 index 000000000000..957e9e0e02c5 --- /dev/null +++ b/nixpkgs/nixos/tests/amazon-ssm-agent.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "amazon-ssm-agent"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes.machine = { config, pkgs, ... }: { + services.amazon-ssm-agent.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_file("/etc/amazon/ssm/seelog.xml") + machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json") + + machine.wait_for_unit("amazon-ssm-agent.service") + ''; +}) diff --git a/nixpkgs/nixos/tests/ocsinventory-agent.nix b/nixpkgs/nixos/tests/ocsinventory-agent.nix new file mode 100644 index 000000000000..67b0c8c91103 --- /dev/null +++ b/nixpkgs/nixos/tests/ocsinventory-agent.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "ocsinventory-agent"; + + nodes.machine = { pkgs, ... }: { + services.ocsinventory-agent = { + enable = true; + settings = { + debug = true; + local = "/var/lib/ocsinventory-agent/reports"; + tag = "MY_INVENTORY_TAG"; + }; + }; + }; + + testScript = '' + path = "/var/lib/ocsinventory-agent/reports" + + # Run the agent to generate the inventory file in offline mode + start_all() + machine.succeed("mkdir -p {}".format(path)) + machine.wait_for_unit("ocsinventory-agent.service") + machine.wait_until_succeeds("journalctl -u ocsinventory-agent.service | grep 'Inventory saved in'") + + # Fetch the path to the generated inventory file + report_file = machine.succeed("find {}/*.ocs -type f | head -n1".format(path)) + + with subtest("Check the tag value"): + tag = machine.succeed( + "${pkgs.libxml2}/bin/xmllint --xpath 'string(/REQUEST/CONTENT/ACCOUNTINFO/KEYVALUE)' {}".format(report_file) + ).rstrip() + assert tag == "MY_INVENTORY_TAG", f"tag is not valid, was '{tag}'" + ''; +}) diff --git a/nixpkgs/nixos/tests/prometheus.nix b/nixpkgs/nixos/tests/prometheus.nix index a075cfc1f1b7..011127389377 100644 --- a/nixpkgs/nixos/tests/prometheus.nix +++ b/nixpkgs/nixos/tests/prometheus.nix @@ -3,6 +3,7 @@ let queryPort = 9090; minioPort = 9000; pushgwPort = 9091; + frontPort = 9092; s3 = { accessKey = "BKIKJAA5BMMU2RHO6IBB"; @@ -152,10 +153,15 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "prometheus:${toString grpcPort}" ]; }; + services.thanos.query-frontend = { + enable = true; + http-address = "0.0.0.0:${toString frontPort}"; + query-frontend.downstream-url = "http://127.0.0.1:${toString queryPort}"; + }; }; store = { pkgs, ... }: { @@ -178,7 +184,7 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "localhost:${toString grpcPort}" ]; }; @@ -262,6 +268,10 @@ in import ./make-test-python.nix { query.wait_for_unit("thanos-query.service") wait_for_metric(query) + # Test Thanos query frontend service + query.wait_for_unit("thanos-query-frontend.service") + query.succeed("curl -sS http://localhost:${toString frontPort}/-/healthy") + # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the # Thanos storage service has correctly downloaded it from S3 and if the Thanos # query service running on $store can correctly retrieve the metric: diff --git a/nixpkgs/nixos/tests/terminal-emulators.nix b/nixpkgs/nixos/tests/terminal-emulators.nix index 6d76cc8e5741..b52801c898eb 100644 --- a/nixpkgs/nixos/tests/terminal-emulators.nix +++ b/nixpkgs/nixos/tests/terminal-emulators.nix @@ -76,6 +76,7 @@ let tests = { rio.pkg = p: p.rio; rio.cmd = "rio -e $command"; + rio.pinkValue = "#FF1261"; roxterm.pkg = p: p.roxterm; roxterm.cmd = "roxterm -e $command"; diff --git a/nixpkgs/nixos/tests/tomcat.nix b/nixpkgs/nixos/tests/tomcat.nix index 4cfb3cc5a7d8..a5f219e104ad 100644 --- a/nixpkgs/nixos/tests/tomcat.nix +++ b/nixpkgs/nixos/tests/tomcat.nix @@ -1,21 +1,26 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ +import ./make-test-python.nix ({ pkgs, ... }: { name = "tomcat"; nodes.machine = { pkgs, ... }: { - services.tomcat.enable = true; + services.tomcat = { + enable = true; + axis2.enable = true; + }; }; testScript = '' machine.wait_for_unit("tomcat.service") machine.wait_for_open_port(8080) machine.wait_for_file("/var/tomcat/webapps/examples"); + + machine.succeed( + "curl -sS --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + ) machine.succeed( - "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + "curl -sS --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" ) machine.succeed( - "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + "curl -sS --fail http://localhost:8080/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'" ) ''; }) diff --git a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index 648bcd67660e..cd845c87b590 100644 --- a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, appstream-glib , desktop-file-utils , fetchFromGitHub , calf @@ -10,9 +11,11 @@ , gsl , gtk4 , itstool +, ladspaH , libadwaita , libbs2b , libebur128 +, libportal-gtk4 , libsamplerate , libsigcxx30 , libsndfile @@ -37,13 +40,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-TuVW2KBJciuFVdduzfFepGOa+UY9+sXRN1gWhfDvXgw="; + hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE="; }; nativeBuildInputs = [ @@ -56,15 +59,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib fftw fftwFloat fmt_9 glib gsl gtk4 + ladspaH libadwaita libbs2b libebur128 + libportal-gtk4 libsamplerate libsigcxx30 libsndfile @@ -102,6 +108,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { + changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; description = "Audio effects for PipeWire applications."; homepage = "https://github.com/wwmm/easyeffects"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index e4a10d82c139..0432224fa3c3 100644 --- a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -9,13 +9,13 @@ buildGo121Module rec { pname = "go-musicfox"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38="; + hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; }; deleteVendor = true; diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 2135af507b6a..f85df83401e0 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins, jack-example-tools }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "magnetophon"; repo = "VoiceOfFaust"; - rev = "V${version}"; - sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + rev = version; + sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU="; }; plugins = [ helmholtz mrpeach ]; @@ -16,35 +16,18 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jack faust2lv2 ]; - runtimeInputs = [ pitchTracker ]; + enableParallelBuilding = true; dontWrapQtApps = true; + makeFlags = [ + "PREFIX=$(out)" + ]; + patchPhase = '' sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker - ''; - - buildPhase = '' - sh install.sh - # so it doesn;t end up in /bin/ : - rm -f install.sh - ''; - - installPhase = '' - mkdir -p $out/bin - - for f in $(find . -executable -type f); do - cp $f $out/bin/ - done - - cp launchers/* $out/bin/ - mkdir $out/PureData/ - # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - cp PureData/* $out/PureData/ - - mkdir -p $out/lib/lv2 - cp -r *.lv2/ $out/lib/lv2 + sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker ''; meta = { diff --git a/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix b/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix index 10bd25e11676..e07904b32485 100644 --- a/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix +++ b/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv +, buildNpmPackage , fetchFromGitHub -, electron -, copyDesktopItems , makeDesktopItem +, copyDesktopItems , makeWrapper +, electron }: -stdenv.mkDerivation rec { +buildNpmPackage rec { pname = "pocket-casts"; version = "0.7.0"; @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; + hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; }; + npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + dontNpmBuild = true; + desktopItems = [ (makeDesktopItem { name = pname; @@ -34,19 +40,12 @@ stdenv.mkDerivation rec { makeWrapper ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - - cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts - install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png - install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png + postInstall = '' + install -Dm644 $out/lib/node_modules/pocket-casts/icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 $out/lib/node_modules/pocket-casts/icon-x360.png $out/share/pixmaps/pocket-casts-x360.png makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ - --add-flags $out/opt/pocket-casts/main.js - - runHook postInstall + --add-flags $out/lib/node_modules/pocket-casts/main.js ''; meta = with lib; { @@ -54,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "pocket-casts"; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix index 9a03c3b4b562..f56fdb09a707 100644 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RQlWWHoij3gtFwjJeEGsmd5YJNTGX0I84nOAQyWBx/M="; + sha256 = "sha256-UbRsY9fSUYAwPcLfGGDHeqvSsLKUKR+2a93jH5xA9uQ="; }; - vendorHash = "sha256-YmUgKO3JtVOE/YACqL/QBiyR1jT/jPCH+Gb0xYwkJEc="; + vendorHash = "sha256-dOvpOCMxxmcAaticSLVlro1L4crAVJWyvgx/JZZ7buE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index ccabb6b11947..ec5bc924f0ca 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.3.1.19"; # "Android Studio Giraffe (2022.3.1)" - sha256Hash = "sha256-JQYl3KsYPgxo6/Eu+KUir3NpUn128e/HBPk8BbAv+p4="; + version = "2022.3.1.20"; # "Android Studio Giraffe (2022.3.1) Patch 2" + sha256Hash = "sha256-IkxOt6DI4cBPUOztEBNJV0DHGruJjVdJ0skxcue+rdg="; }; betaVersion = { - version = "2023.1.1.17"; # "Android Studio Hedgehog (2023.3.1)" - sha256Hash = "sha256-0sN+B1RxxlbgxXrEs8gft4qjvIYtazJS6DllHZ2h768="; + version = "2023.1.1.25"; # "Android Studio Hedgehog | 2023.1.1 RC 3" + sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; }; latestVersion = { - version = "2023.2.1.1"; # Android Studio Iguana (2023.2.1) Canary 1 - sha256Hash = "sha256-7ub9GkJd9J37nG2drXOuU7r4w/gI+m9nlWANqIk2ddk="; + version = "2023.2.1.14"; # "Android Studio Iguana | 2023.2.1 Canary 14" + sha256Hash = "sha256-8szERftch1JWJ66BclJBq5DZcH1Xf1cyVj08WknLoS8="; }; in { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index ffd8253ae2c4..8a8aa1119ead 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -654,10 +654,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2.0.20231106.215852"; + version = "0.3.0.20231111.144610"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.2.0.20231106.215852.tar"; - sha256 = "17qjjifdl3y8p4ldzami9b3ns9mzzqdacvkzsryv5885hzas67zz"; + url = "https://elpa.gnu.org/devel/bufferlo-0.3.0.20231111.144610.tar"; + sha256 = "02vsgmfn7z4772dgfy9laraqrslzz7nqdaibzpj5qx2k0gxrh0nb"; }; packageRequires = [ emacs ]; meta = { @@ -920,14 +920,17 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + company = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231110.5234"; + version = "0.10.2.0.20231115.182802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231110.5234.tar"; - sha256 = "18533dlk7k77if51kjhwlf2yb872ixjf1cffg197bnfy29sdrm11"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231115.182802.tar"; + sha256 = "0l18qi7m8anawl466xd7r3i3cjvhqprhwzclpw92x7hzgnjv73nl"; }; packageRequires = [ emacs ]; meta = { @@ -1000,10 +1003,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3.0.20231107.184238"; + version = "29.1.4.4.0.20231113.72021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.3.0.20231107.184238.tar"; - sha256 = "1mcfx5my48zr14syzmpidgr1kjji2v63sqmx3zh7spxxd274yviq"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20231113.72021.tar"; + sha256 = "0w6dy2356k1k0g4kbr81wv431fb9by03nc7rdgwnsyq4cs3dd46s"; }; packageRequires = [ emacs seq ]; meta = { @@ -1015,10 +1018,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231107.212252"; + version = "0.35.0.20231115.174657"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231107.212252.tar"; - sha256 = "1p9l79sxxa06cxky5z08mccf34hbbp742iza57riknf0zmrglkpc"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231115.174657.tar"; + sha256 = "0j8kj3d2svqns4z2pp18rc6x9blfz0w41r73934wdjxw2fri9wbd"; }; packageRequires = [ compat emacs ]; meta = { @@ -1067,10 +1070,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20231108.174629"; + version = "0.38.0.20231112.81933"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231108.174629.tar"; - sha256 = "1ynkyw7mkl8y66kxwy51gwdj60b4nadk9qbwsjljbfdnc80y6ws5"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231112.81933.tar"; + sha256 = "1zmd13qbdknw03l65fir3a4niq5lbacj28j5kqknka87f3lz4pd2"; }; packageRequires = [ compat emacs ]; meta = { @@ -1332,10 +1335,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20231107.64253"; + version = "2.1.0.0.20231115.111152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231107.64253.tar"; - sha256 = "143pgnsfi3mf42n1yrwjr79b32k0081i19zdkwg97xhvfbqhiddw"; + url = "https://elpa.gnu.org/devel/denote-2.1.0.0.20231115.111152.tar"; + sha256 = "0mp57k3z1gyc21lj010yi9nb3qpqd6yirysf9ljcy9h5bxnqafmh"; }; packageRequires = [ emacs ]; meta = { @@ -1491,10 +1494,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2.0.20231109.135341"; + version = "0.3.0.20231114.215046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-duplicates-0.2.0.20231109.135341.tar"; - sha256 = "07ridbcy3n0v3dax7kj3d7nk2k0w57dnapd4kki4xhkm4fklx6w6"; + url = "https://elpa.gnu.org/devel/dired-duplicates-0.3.0.20231114.215046.tar"; + sha256 = "0rla938sj1zig7qcdxybl7qm4x1b0ndpf9xf9ikj0vfdghyg7z2s"; }; packageRequires = [ emacs ]; meta = { @@ -1634,6 +1637,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1.0.20231112.180047"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231112.180047.tar"; + sha256 = "09s55hfy11y7v1d2l6nggz8b27mrsvqabb5xwpipnnynkmif2q2q"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -1800,10 +1818,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20231107.90944"; + version = "1.15.0.20231115.41203"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231107.90944.tar"; - sha256 = "135a3zyzjpv2n0c988b9g9mh93y7p1dp9nvmchm4i26mdmzn6jbz"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231115.41203.tar"; + sha256 = "0xybf9czzkdpv94qsbmq725scmjjkm4gwn74ffa8r99a0i1w2nki"; }; packageRequires = [ eldoc @@ -1911,10 +1929,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231104.193345"; + version = "0.23.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231104.193345.tar"; - sha256 = "10qny8wp74np12sczz08gfrxspvapwvz2zkdig76wcrpd4kdpjk4"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231112.53804.tar"; + sha256 = "056kgr14msd6fhzwpdazzaxzmn65wm6qp59z22l5ykpr8awl4jxi"; }; packageRequires = [ compat emacs ]; meta = { @@ -1931,10 +1949,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231104.193345"; + version = "0.8.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231104.193345.tar"; - sha256 = "15syrabv26yq69g2lz2dqs8w4drw1v3whr0h2vzmc1p0pv9jpks2"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231112.53804.tar"; + sha256 = "1fxk8hfid2ii912can7b1gp8fzkq31y1cfi53n9mw6p0nj26c1fh"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1956,10 +1974,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14pre0.20231029.40923"; + version = "0.14pre0.20231111.212243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231029.40923.tar"; - sha256 = "06r0s8dxlxr63a1zgdk0qxzd6x27r6mlymi6hxp8923yvwqddkdf"; + url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231111.212243.tar"; + sha256 = "13xd7m5pigfvqnrxqr40dg9139djb0m9l3p7scvi0fi05247kf5l"; }; packageRequires = [ emacs @@ -1985,10 +2003,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20231106.173540"; + version = "16.0.20231110.185602"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20231106.173540.tar"; - sha256 = "08l7nzz596jwqr4wcjcvsihdhai4faqihavrshvja2nhrdxxm79x"; + url = "https://elpa.gnu.org/devel/emms-16.0.20231110.185602.tar"; + sha256 = "114dsyncfcgrxjypf475n5kabcmm08szq4sa2grqv5gcm9l63qwr"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2054,10 +2072,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231104.154155"; + version = "5.6snapshot0.20231112.203749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231104.154155.tar"; - sha256 = "0z22cw6hgn4lsc1bp4ci75v03mvlra1nyfj8g7xkfdv75nbv2yga"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231112.203749.tar"; + sha256 = "1zag35hnzc72gbjr00ljfz803z8rmz8qhyxxvcxaia769vhmh5j8"; }; packageRequires = [ compat emacs ]; meta = { @@ -2633,10 +2651,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4.0.20231015.114428"; + version = "1.0.5.0.20231115.90848"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-mode-1.0.4.0.20231015.114428.tar"; - sha256 = "1y3571ymlrgiq5jxbwlyw43pmfxgq776pajb9hlvyz9l3w195c8g"; + url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; + sha256 = "1z7v8kwamh217k0lfwcdycj4wnq4dj9lrryppqhjdqb7cj02bmdz"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2683,10 +2701,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.6.0.0.20231104.45848"; + version = "0.6.0.0.20231113.71128"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231104.45848.tar"; - sha256 = "1ppvgi17agzrsjfd9jaa5zszvqcm1n4rfy7z82da4rl5mbgnml9p"; + url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231113.71128.tar"; + sha256 = "19aj5bp72ic2j9fv4lygnpj01bl89ifcw4s75lqasff60mlv0320"; }; packageRequires = [ emacs ]; meta = { @@ -3113,10 +3131,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231104.142700"; + version = "0.9.0.20231111.85046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231104.142700.tar"; - sha256 = "16qq42qmklyls2fc482x2pv1l14x3kn78l41imvg8jrv3z64j89p"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231111.85046.tar"; + sha256 = "1dp2sclzrr5918n2zjzyxhxcf3sd393a3a4xr4c8wdi2wdpmn1vs"; }; packageRequires = [ compat emacs ]; meta = { @@ -3720,10 +3738,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20231031.71656"; + version = "4.3.0.0.20231115.130235"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231031.71656.tar"; - sha256 = "04hjhg596qfkrnll0wrg4f50ilns28jpf2ws7021wivr370xajki"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231115.130235.tar"; + sha256 = "025iqd3c9kwrv1hwdr1szp1cl23bkf1vahad6nhx00x351rxv0r0"; }; packageRequires = [ emacs ]; meta = { @@ -4139,10 +4157,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20231107.210315"; + version = "1.0.0.20231110.144817"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231107.210315.tar"; - sha256 = "0j5fkmw4qy40ab2c6d0mf6637s8q95gi3sp7w477d6ymck5i2ck8"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231110.144817.tar"; + sha256 = "0cfspqc7livr0m3s021gp2cl74qnv1pvyxba83af0088nb9z0aqz"; }; packageRequires = [ emacs ]; meta = { @@ -4154,10 +4172,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231108.95550"; + version = "9.7pre0.20231115.92033"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231108.95550.tar"; - sha256 = "01dk4sq5wfiwj9g5bfriqqkfrgdfy3c7kixd7y4cf9k6pbjl4sfp"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231115.92033.tar"; + sha256 = "18sbwnw57xp9ss78f3xva3jysdvzk0lcppr2g4qgb696fkglp6w1"; }; packageRequires = [ emacs ]; meta = { @@ -4773,10 +4791,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20231101.62313"; + version = "1.0.1.0.20231115.55251"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231101.62313.tar"; - sha256 = "10k57sd29hkbja85sn5yf7wm0g5wyk216ykdjl4vr03891ic03dg"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231115.55251.tar"; + sha256 = "15pvf6f0g423w3vi86l8djxvzzrvziml7rlqp314xskp8kz7w6g6"; }; packageRequires = [ emacs ]; meta = { @@ -4940,10 +4958,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.1.0.20231020.222710"; + version = "1.5.1.0.20231113.141045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231020.222710.tar"; - sha256 = "0lmq7x7x8cm6y8vp2gin1h6h7chkflj5fyzls4b61rh15yg8m1h0"; + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; + sha256 = "1lidmlrsg0jax0mmsxgpjk70x4i4vhiv5ira744rj7m3w0mwgmrw"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -5621,10 +5639,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.1.0.0.20230606.175440"; + version = "0.1.0.0.20231115.114712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20230606.175440.tar"; - sha256 = "01541k8j5g920vnj3ds6ancqyi36n6ak00g4rq5vc6ia1ybxiijh"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20231115.114712.tar"; + sha256 = "1why1wwbpasmag8czsgb65f8gkqjcg5hckgmk9106ml834krhhx5"; }; packageRequires = [ emacs ]; meta = { @@ -5719,10 +5737,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.3.0.20231103.213748"; + version = "0.3.0.20231114.102408"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.3.0.20231103.213748.tar"; - sha256 = "1nr6faizww1nzv5lpdikbqxkc6i1hswg2qa50cybl05ycqq9b10a"; + url = "https://elpa.gnu.org/devel/srht-0.3.0.20231114.102408.tar"; + sha256 = "0s5xa8vqb6wzxmv3vx8cc8lkpnnkfzdjljra7lz105m3v2adz1a0"; }; packageRequires = [ emacs plz ]; meta = { @@ -6042,10 +6060,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20231106.72513"; + version = "0.8.0.20231111.112832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231106.72513.tar"; - sha256 = "1pbw7wrhz5h1xykbc1ihhpzqc0kki6k637wagx8yfz95n606808d"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231111.112832.tar"; + sha256 = "1gd4dvill1vvdncibjfv7vl1rxlkhcq2nfppczyp2sr565fgcb0c"; }; packageRequires = [ compat emacs ]; meta = { @@ -6230,10 +6248,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20231027.212124"; + version = "0.4.3.0.20231112.92348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231027.212124.tar"; - sha256 = "0rzc5ks0b9nlnvggj7hn9648y5siw9qjpg8n3swlmkb68m3b2c05"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231112.92348.tar"; + sha256 = "01yvwx8psllys34fry1vp2h7w3jll8kcrglsri8p2d3bps45pn14"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6408,10 +6426,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20231101.193012"; + version = "0.3.0snapshot0.20231110.152111"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231101.193012.tar"; - sha256 = "12hmms0yr0vybayvzkbqbp5j428lsnirzwg93f1l8m05xxs3xm9w"; + url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231110.152111.tar"; + sha256 = "15vbi4vjqr9kz1q1525snl5pz35mgbzrjkysl7gm4zpj6s6qcbar"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6643,10 +6661,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20231108.202420"; + version = "1.4.0.20231115.164627"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231108.202420.tar"; - sha256 = "1c34pq5l7ckjlyimpa528d8a7q5pakz3li5bc4ka86mwf861kd7v"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231115.164627.tar"; + sha256 = "1rb2lvk2h7qxddws53n0qp5mg71b6gy94rdqy6nz77f1p3rrxqwf"; }; packageRequires = [ compat emacs ]; meta = { @@ -6663,10 +6681,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.3.0.20230818.15224"; + version = "0.7.3.0.20231115.51213"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20230818.15224.tar"; - sha256 = "0q23yw8dy9abawqlcpwjrk668kvxyffv972j0s6579z37i643gv6"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20231115.51213.tar"; + sha256 = "1ymjcby120181rfl353kdx1i4jpg5vb6vrag5775bknr3ijjqax9"; }; packageRequires = [ emacs posframe vertico ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 6152ef002fd2..c214731a2289 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -569,10 +569,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.2.tar"; - sha256 = "1dvpzxlnzs037wz9xhiwiz2qrc7r2i05z6p6p0sy8i4kb6scc6gy"; + url = "https://elpa.gnu.org/packages/bufferlo-0.3.tar"; + sha256 = "16fj1wiqymyys0wjnbmmfwpvqxnm3mlqfrg7nrsryfgpv2mv9z17"; }; packageRequires = [ emacs ]; meta = { @@ -877,10 +877,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3"; + version = "29.1.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.3.tar"; - sha256 = "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.4.tar"; + sha256 = "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr"; }; packageRequires = [ emacs seq ]; meta = { @@ -1177,10 +1177,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.0.0.tar"; - sha256 = "1wrfbirkzf9szss1rgpmgdr0gy2dvhnbzlnyhw3sp2jvw5sb1xz9"; + url = "https://elpa.gnu.org/packages/denote-2.1.0.tar"; + sha256 = "1igp9h327b9x3fxrp34bz0x5slk659r3asjdia3jm8amajm4bw6s"; }; packageRequires = [ emacs ]; meta = { @@ -1318,10 +1318,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-duplicates-0.2.tar"; - sha256 = "1n5n961f1mrvcqfrz56734qj1ynajdjblyf4y60pw9m3fn03db4s"; + url = "https://elpa.gnu.org/packages/dired-duplicates-0.3.tar"; + sha256 = "1b9drjkbs9anqil274jrn031agpkir9mhs96l2ylm13n8imx9msl"; }; packageRequires = [ emacs ]; meta = { @@ -1449,6 +1449,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/drepl-0.1.tar"; + sha256 = "0lx94kcxgp8s13w7hz9857r9baqfswvj7vc9frjq4crc4ps7fi7r"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -2357,10 +2372,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-mode-1.0.4.tar"; - sha256 = "1c97m28i6lym07kb05jgssjxj6p9v3v56qrn48xwv55sriqrha4l"; + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; + sha256 = "1ksafa4nfd4n1kdxpjk6i59l5rxfdmcqjkkpmmc8w402xka0vwn4"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -3753,10 +3768,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.11"; + version = "9.6.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.11.tar"; - sha256 = "18hp5jx90wn9xsg8frql3r1kmn2q9qph6plcssj64fp34wcwxsd8"; + url = "https://elpa.gnu.org/packages/org-9.6.12.tar"; + sha256 = "0qkq7vx3kga18001clsac4rbg9bw5cp9k5qnixw7s39xajd4bcv3"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 27ab7dbd543d..37a9e04418c6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.11.0.tar"; - sha256 = "010sl2l9vx3k095bkgvi7w1zvb68jh7lj4plmjn98lmzmbhq7q27"; + url = "https://elpa.nongnu.org/nongnu/cider-1.11.1.tar"; + sha256 = "1zp24p67w9wcc26s0b95idvzy1ndk35a8rabj3ckg1sgddgzh0p6"; }; packageRequires = [ clojure-mode @@ -1534,10 +1534,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.4"; + version = "17.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.4.tar"; - sha256 = "0xf8smasbb53ddg4vxckpg5w48dnm16v2k5vimfqr73cig49z87f"; + url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; + sha256 = "0ld9wjak3fzwi9w2552fzq1562h7g19q69pigp16rj30smp5gkj7"; }; packageRequires = [ emacs ]; meta = { @@ -2375,10 +2375,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.20.tar"; - sha256 = "13ff9g2lzcddi8n6bcmb7g93kxc8v9h3g9k8qcn42bl7jjy12iqf"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.21.tar"; + sha256 = "01yli62vcnh763pf1bp0f649hhrbl8y7ad89q7b98xgcciqgzm93"; }; packageRequires = [ cl-lib compat emacs let-alist ]; meta = { @@ -2608,10 +2608,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20231109.110741"; + version = "1.0.20231115.104415"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231109.110741.tar"; - sha256 = "19d1bs0ajc28wa49f1mphdwrpfywib5cvv3mxip6az9x6faand7g"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231115.104415.tar"; + sha256 = "01ihh66c20c2dv6apswgww8wxwn1ldqhpk70mfbgjipc9a7ykwws"; }; packageRequires = [ emacs ]; meta = { @@ -2987,10 +2987,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.6.tar"; - sha256 = "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.7.tar"; + sha256 = "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib"; }; packageRequires = [ emacs ]; meta = { @@ -3002,10 +3002,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.26.2"; + version = "0.27.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.2.tar"; - sha256 = "14rcg6rs4dd4a0pr4makkg1flwxfrxyg5xrs5sa034bzxj6zqal5"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.0.tar"; + sha256 = "1r0qspi9qdnsa4gm9bmxzsjyalqi14jhjx96jqw725pmhvjy9933"; }; packageRequires = [ compat emacs ]; meta = { @@ -3471,10 +3471,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.15.20231105091131"; + version = "24.18.20231115084756"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.15.20231105091131.tar"; - sha256 = "13wvf6zn87xpglpycxmjmq6mfvpr21bsihsshx06my38832kw128"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.18.20231115084756.tar"; + sha256 = "1vj8l4g4hpdvs1yvgkcy79vbf2ibhwxfgcrg1mj26qj3f9naf25s"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 3c839bdb0419..eb98b6176fea 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -3811,17 +3811,17 @@ }, { "ename": "apheleia", - "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", - "sha256": "17aknfx1ii97lsqm4228rxawa6klnxpi948pl5bzwls9fx91g31v", + "commit": "b2cbf8111f532b35eb1c818d8c1f8297f3241000", + "sha256": "0sahfd897g34b59r80kl697yfcfx9s62v8b1p66iv3ivfl9wvswd", "fetcher": "github", "repo": "radian-software/apheleia", "unstable": { "version": [ - 20231105, - 2008 + 20231112, + 32 ], - "commit": "54a192c3454e82be9d5ad910d80796b27d58035f", - "sha256": "0wac6qhv89c6x2scbdxhxdrjhqm3jmm7fzzvirxibyd94fxjzzd3" + "commit": "ddea9bea708ce029cea6126b5be8e9f8979c58b3", + "sha256": "05lg9qych2x31cw8clfngrhzqgs858kcawnk07pyp45563pm0zjl" }, "stable": { "version": [ @@ -4576,20 +4576,26 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20231110, - 1334 + 20231115, + 2156 + ], + "deps": [ + "named-timer" ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" }, "stable": { "version": [ 0, 4, - 1 + 5 + ], + "deps": [ + "named-timer" ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" } }, { @@ -6196,11 +6202,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231022, - 1757 + 20231115, + 1037 ], - "commit": "a32d83a2c8714c5f2fdb8cc8cb6733a2eb1a4e87", - "sha256": "1k3nyp4h9iqz6cx90g469jf2j7kvr4q8mqn2i0han2a406izk9n5" + "commit": "7b3f26d24be4732e001ae3a0e0db35111e68c38f", + "sha256": "00zgkg3biy3lkaj9jsmn7b4nmnlyj0bqsjfc4qabm2mk0yar0is6" } }, { @@ -9248,11 +9254,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20231110, - 943 + 20231112, + 1455 ], - "commit": "0238406db380b733708e4ad7e5a75aeafe6a2640", - "sha256": "1rrjhkhsgfgzcbwgn6hlzh3n87205jj9yk3qpaflqhw83axms5jh" + "commit": "dbe094221fd727b8d3a4bffa84fc754df83c0450", + "sha256": "1m9z3sswm79rawivgz4fw51cp20qznsa9911dci3b2xpnnhpz89i" } }, { @@ -11662,16 +11668,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20231109, - 1008 + 20231112, + 904 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "ac122af751ba9903599c6eb9c3e9e12a375e19d0", - "sha256": "1712a7dhiw6a2bj4qq916dx2gk3124g7shxnizyy3nsvc6q08cdi" + "commit": "2640b72b7eed0b5f702377d3e0d723c23dda792f", + "sha256": "1g31lyzl3fx3bqgd1yrjrpb7a8zbl3sr8jqsssn5f6yp4lm4bqzb" }, "stable": { "version": [ @@ -11800,14 +11806,14 @@ "repo": "positron-solutions/champagne", "unstable": { "version": [ - 20230511, - 1540 + 20231111, + 358 ], "deps": [ "posframe" ], - "commit": "069452fa162d6aefc693c8d0546a84d967218289", - "sha256": "1qby7d95rl1vrkvq5y1i2bmy1bijv9pxm4whfwnhz9fkb3s88r9f" + "commit": "a99e1584207bc03a0cb776f715bd47de1d651010", + "sha256": "09ms3yx7h2ynqyf9mdjp90asahncq7k1mvnbkvj1g9f1l59zk6ns" }, "stable": { "version": [ @@ -11932,14 +11938,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231108, - 1115 + 20231113, + 356 ], "deps": [ "shell-maker" ], - "commit": "a05e30073f42eb6c10dfe0741ff86d3c22e914b4", - "sha256": "07j4pvb7li43c6ldakzfyj88s20f0dnfzn0ilpvf76i5q66hpqcr" + "commit": "50984ba1e833be89c41b9779e8dca5d04cb16a29", + "sha256": "1fvcd3gyipxq9x3yfl5q6i3yx2fq5vwqf6wx4c200awqc1crs89l" } }, { @@ -12571,8 +12577,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231108, - 2054 + 20231114, + 1140 ], "deps": [ "clojure-mode", @@ -12583,14 +12589,14 @@ "spinner", "transient" ], - "commit": "bf9dceca17e912605e2d8327c44ed241e2a556e2", - "sha256": "1wca624gdnrqlkadlqafj0xibma8xgsh9qqpzynr6b8q2vmff98j" + "commit": "5261886ad7c0a8828d022812c7c1c6b503ddd6ba", + "sha256": "1m9bva5wi4mna80qrr401pvghxk54nh773544c5i11fanisyq9sc" }, "stable": { "version": [ 1, 11, - 0 + 1 ], "deps": [ "clojure-mode", @@ -12601,8 +12607,8 @@ "spinner", "transient" ], - "commit": "6e5294624959736c486f7a466bd5e78ce6183ab9", - "sha256": "0zr3p8isidfh9w44cjq50wk13balbswyyn2ycs368afkraqbry5w" + "commit": "9c605cd4938c0055c2766c55606f19ecbf664e8e", + "sha256": "15s8nvzgz4ymayg0k3nia9h7kcrn5c8m4clspgz2pzz3ywh10cfw" } }, { @@ -12883,16 +12889,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231019, - 2047 + 20231112, + 1605 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", - "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" + "commit": "8115bed9d4ce0b7a0765de6fbe6b4efdad23b89e", + "sha256": "1mmlax5z437d96wn3v2gjck3cmx8k8r370rrymiisgjar8sj8bg9" }, "stable": { "version": [ @@ -13524,8 +13530,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20231009, - 1104 + 20231116, + 525 ], "deps": [ "cider", @@ -13538,8 +13544,8 @@ "seq", "yasnippet" ], - "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", - "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" + "commit": "05e90bd9a0f24027011aab1bf041c16a24797e0c", + "sha256": "0y91034nkvx9sz69k5wfynf0cj4rcwnav33n8bq72cknvv67zll8" }, "stable": { "version": [ @@ -14221,20 +14227,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20231006, - 1308 + 20231115, + 1355 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" }, "stable": { "version": [ 3, 27, - 7 + 8 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" } }, { @@ -15266,11 +15272,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231110, - 52 + 20231115, + 2254 ], - "commit": "07d1c41f83d5ad5f6263e726283a05ad12cd37a5", - "sha256": "0f2hnypzdggfw8dxyysf05n51za86qs1z6b8syrdnkyxcm41j793" + "commit": "e22230561ef559b032b4a2d79bef686d494b8ea6", + "sha256": "02lhq2iaxyarvq0h194ivzvw8fncvv0a1hp9dxhd47jr83k0wj84" }, "stable": { "version": [ @@ -17620,14 +17626,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231110, - 926 + 20231115, + 1746 ], "deps": [ "compat" ], - "commit": "f36be0c05b9bea10cc7b477a7c82a196cee7c58a", - "sha256": "0n604z8xviwc58944d33zxq20xyn3i01rvh28av1mx4hvlgjd1zp" + "commit": "d7a0415c4ff3a84b696e5ddbc2ef15d0d45c405d", + "sha256": "15lvjb0hv3vb7xylavi2xsqdxq3b2ryi0zd866h5a3njhkk1sv76" }, "stable": { "version": [ @@ -17890,28 +17896,26 @@ "repo": "tomoya/consult-ghq", "unstable": { "version": [ - 20210606, - 2047 + 20231111, + 1303 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" } }, { @@ -18406,26 +18410,26 @@ "repo": "sshaw/copy-as-format", "unstable": { "version": [ - 20231104, - 1933 + 20231112, + 1710 ], "deps": [ "cl-lib" ], - "commit": "d4a88544d3e89385cc401f2026e8d46ca02e7ca4", - "sha256": "09c5ic11iikldqhdfrym57ry167dxln5bv75vv459xzf0nw9iqaw" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" }, "stable": { "version": [ 0, 0, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "d2376c64334fe3de65d89d6d138a2187f9bf802f", - "sha256": "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" } }, { @@ -18548,14 +18552,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20231108, - 1746 + 20231112, + 819 ], "deps": [ "compat" ], - "commit": "42efcfd28f6286110cc2ba0d90ffd67a81e0667b", - "sha256": "0ns0xli4l53vxmw8bshnqqi0zm85nld6p2vw30psfpgaz70j2zqy" + "commit": "41e35c23a3512df658cdea95b246977923af56f5", + "sha256": "1gpzlrq631839jds991pzplqnz92yifsmvxbylh4rswpzcmrn46g" }, "stable": { "version": [ @@ -20907,14 +20911,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 913 + 20231112, + 449 ], "deps": [ "shell-maker" ], - "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", - "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" + "commit": "bca784daa620767b5e57a5020289cb547c40f8b3", + "sha256": "1gzzfsw0bdyqbq6fgfsl0vwy0z639618sq74kdvk0hnssrbx1f01" } }, { @@ -21021,8 +21025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20231110, - 659 + 20231113, + 706 ], "deps": [ "bui", @@ -21035,8 +21039,8 @@ "posframe", "s" ], - "commit": "f6706fa917aecdd1ebf71ee217724622cc6a97e4", - "sha256": "0jjnhl5hrpvdd4qb3jz6pdjgrp9qjxbm5dbgdhi6bkl2jhxy93fv" + "commit": "755845ae053bbfdd3f7b3dca13efa4be480370b5", + "sha256": "0rj0y85gkn50cly77dmy8g1z16czi1vg6qc9sh75x1vl7s1wr615" }, "stable": { "version": [ @@ -23438,11 +23442,11 @@ "repo": "hjudt/dired-duplicates", "unstable": { "version": [ - 20231109, - 1353 + 20231114, + 2150 ], - "commit": "349eebbd8b3fc10fa2a4551426769d20744e2eb2", - "sha256": "0zpv0112xphvci5rdw04qai9pdjf2ig6jf4kianwjzlgcrma5zar" + "commit": "e07552323b26ce68956f8b03aa66af145bae4d86", + "sha256": "1psa217zsl91qkvlrkysw7ycv9rc6vk8462rf6lfjmvb9bf5hpqm" } }, { @@ -26401,11 +26405,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231109, - 856 + 20231113, + 759 ], - "commit": "642a907fdec8b765e777d0c9656388694a15dae9", - "sha256": "15fsn7dp6jngyl8457rcrsq243r93plamn4wdlidgm3kb05lyaqk" + "commit": "e4a139fe181ed1b576302fb36f3761fbf9914580", + "sha256": "03rincnyz895d0g49gifbjn8b7gr5b37c8fbpk7anrrp29gfr6n1" } }, { @@ -26869,26 +26873,26 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20231103, - 840 + 20231113, + 908 ], "deps": [ "dash" ], - "commit": "2f8ad56c8d9b3e6226b6641de1f8b61571225950", - "sha256": "01dbyplh6gwkk85amrx916h1lxjdbnvps7wqai3ny9wfixh7w0q8" + "commit": "98c53882a6b6703c62d7a59e0dcdf5e29ca2ca95", + "sha256": "17isgyg85fdhhhzn9jh6d0cba19ag7zwkppc1n34i2knm91411hm" }, "stable": { "version": [ 0, 8, - 3 + 6 ], "deps": [ "dash" ], - "commit": "be79e9fd4ba705308ed26a801c1072c0fd46a58c", - "sha256": "14wxlmmm6pylj6zw18q76p82bmlvd4sqgfwmd57fs7gjdv0qgqis" + "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", + "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" } }, { @@ -27181,11 +27185,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20221122, - 427 + 20231113, + 748 ], - "commit": "0c6cf404a49bd68800221446df186fffa0139325", - "sha256": "09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4" + "commit": "c854d128cba8576fe9693c19109b5deafb573e99", + "sha256": "0zfgns9q8bqiwjckfqcywzv00j3984r5kni5xp5rz3wxx8pgqvkv" } }, { @@ -28210,11 +28214,11 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20230525, - 651 + 20231112, + 2210 ], - "commit": "8cabc6d77b41bf0c9982ab56530c088d980bc353", - "sha256": "02hbvs6dqjcjiws3672frgbnr62l2biqjqs0npkhz6b50h99gzzr" + "commit": "1979bec36dba95168c9e6c68bd7d9248502de68e", + "sha256": "0dizx7clclwlgg858kbhg6ds4aj4949anwk0hf72dn08dxadwk81" }, "stable": { "version": [ @@ -28347,28 +28351,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20231007, - 340 + 20231111, + 513 ], "deps": [ "llm", "triples" ], - "commit": "bd7bb3bde2508455471a848d7013e169a81f1de0", - "sha256": "00sj500009y45jf1apdvdl8p5l163vxjk07bryzp4bbk2q6qsfyp" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "llm", "triples" ], - "commit": "74d43f53cf9b11c40cf97de26d871a39c2ec596f", - "sha256": "0gj7ka0whp7wv1izfzgrsrkcizzpvmpjc0v1kzc1hqm8wsd9l4sq" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" } }, { @@ -28889,19 +28893,19 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231107, - 2029 + 20231115, + 1824 ], - "commit": "ce5f3e14d7c5ab21dfb3e50235bfe495808b705a", - "sha256": "01ax4nzdby25szjmy63fmxjd8hf0a6hkkj555xylldq9bx5ax899" + "commit": "2aefc4d2820d922073917c7f87ea83c80c930ca6", + "sha256": "0z98cwzfj71xnq5wk5hgvdf2ar150cr6xs8mxwdi2204mqzzdsnd" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "9ae24a8b62643d6e194d0754611dc014304c1183", - "sha256": "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5" + "commit": "c207e9537255d9167f9c578b2effc864f7e87743", + "sha256": "1jzknbdcvq4dp36f7p5abksd524lrlnmh6wycf0h3513wqnrprf8" } }, { @@ -28912,11 +28916,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20231008, - 2250 + 20231115, + 519 ], - "commit": "06c905bb4ac6bb35035d65ef5de0de9ce6dff763", - "sha256": "0fzdzks18lyx19kigydbdi2lg260p3wiq0v6sf4xb13ypsx6pyfv" + "commit": "c36f31074b09930e8425963f39d5508da6d2c32d", + "sha256": "0vglh3sp9x6z537jngh5jh9j3szbfadryzlwhmrlq7asiinnjq01" }, "stable": { "version": [ @@ -29325,26 +29329,26 @@ "repo": "rnadler/elfeed-curate", "unstable": { "version": [ - 20231001, - 1926 + 20231110, + 1646 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" } }, { @@ -29681,11 +29685,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20231026, - 2028 + 20231112, + 552 ], - "commit": "d5d6010a1bc1b1f5a2422474f701d4573a95aa5b", - "sha256": "055k3za0c5jpa5lgqic9749zsf7vrfzfhcinhhpkrw95amyhpy76" + "commit": "ac9f2cc1482a7ef4b84d87bd990208030bfc5f57", + "sha256": "1nr5x9mq24w5dib39zyb95c7ksdp3k7scgsb1r5ldywjss4z44da" } }, { @@ -29947,14 +29951,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20231025, - 640 + 20231115, + 1851 ], "deps": [ "heex-ts-mode" ], - "commit": "cb536ff3e70b70004687bbf583757f6929ce0238", - "sha256": "1x55zig1jj8qiarhv6hzmam96jzafwlnsanjq3jqnl5rybr8nsxy" + "commit": "d56d5915d4540a4f55f495e27407637d0359c774", + "sha256": "02jys0wnp2s601mgqa6fi3jamjy1dprima1q594wdjf82av2n8sv" } }, { @@ -31110,14 +31114,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231105, - 133 + 20231112, + 1138 ], "deps": [ "compat" ], - "commit": "8c57c361d686d352f22bd570fee4976f6ab42bcc", - "sha256": "0cnv6lzbrl8pa8p4v3llm1alas5p1zs32nndsi626l2aqbjyfx8z" + "commit": "3f08fc8ede9dddad3752223e01643058594781b2", + "sha256": "1a08mpfq79mc1n4g9d07wjf7cm0bgi9a3gxkfdsyw52sy82fdr1b" }, "stable": { "version": [ @@ -31315,16 +31319,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231106, - 2235 + 20231110, + 2356 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "f3701eea3d0159ea9a2b44c5cce3886be73ff3df", - "sha256": "0dblq6d938hxw0y4920653qqp8m6p1g91qgg311idc5azzy3hdp0" + "commit": "e4bba7abbcebdc76d9b709846867d50f8bc98513", + "sha256": "05c63pq3wjmg3ahndsnk67mvv6hv38p5wfd2v7awbngf3la9rrcv" }, "stable": { "version": [ @@ -36173,11 +36177,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20231026, - 1357 + 20231115, + 1445 ], - "commit": "b98c1c6d0b08317c9094bb222739ee037afbe7cd", - "sha256": "05y2sy9kbxk81pg6s45n9d1pymfm7zd0bz5zp6b240hyqc5qx8m8" + "commit": "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f", + "sha256": "0j2zrhdffr3i9bwnaam5n908xmaq9z230sx6flid94cp9pvsxmxb" } }, { @@ -37936,11 +37940,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20231016, - 1415 + 20231112, + 911 + ], + "deps": [ + "markdown-mode" ], - "commit": "a9f5c41f14dcde42bd384274de9b45c2d39f1dc2", - "sha256": "00gacr1rf40r8zgy7gkd7maq905mx6g4mcnczjc2jlxh4iwp6gw1" + "commit": "e606fd40de36ad2131d027dec4f254e59a120dd5", + "sha256": "1chzzpk19z0siylh3z9sc05pjhibj9ld37iakc2v082dhd3f3sxk" } }, { @@ -39153,11 +39160,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20231026, - 905 + 20231114, + 1714 ], - "commit": "149d00ee4cd17ab465db004910b67456db142802", - "sha256": "056hzf4r8bzzmmhlrgh6f0pppsr3spbrpiwb2kpkdbg1fwi9bjkf" + "commit": "5305cc3deaf361f57c67c57d10ade2bd448603e9", + "sha256": "1pg8mp3nghpmif2f94blrbv50xb9xp7pibnyfm0kpgh5gnciz3ab" } }, { @@ -43265,14 +43272,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20230417, - 1142 + 20231114, + 1120 ], "deps": [ "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "495e22f98e3075d0d9a14ebec87771eaf967b996", + "sha256": "1khbknia1vhif6a26mcvx1d1mawvkxb84m16ghhp5vfna6g3sk64" }, "stable": { "version": [ @@ -45926,14 +45933,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20231001, - 1932 + 20231111, + 1149 ], "deps": [ "project" ], - "commit": "58bd510da5d09d9de52f4a6e60882b35445ca17a", - "sha256": "0n4346dc6kd0czj666lpmfq6ir6mrw0i45nkwpym6fhpg9cdynhy" + "commit": "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe", + "sha256": "05kk8pa8dgm2bv9k2rfxi0m1kdpzz40csn7jgl5a38w1l1yjcffl" }, "stable": { "version": [ @@ -46274,6 +46281,21 @@ } }, { + "ename": "gemtext-mode", + "commit": "5f16cf1dd7fd792ed631d2925edc6203fe0d231d", + "sha256": "1hbcsah3z1h95z93srdf5rkjq3icb6gcmq5r8sv6z8k026xy56sb", + "fetcher": "sourcehut", + "repo": "arjca/gemtext-mode.el", + "unstable": { + "version": [ + 20231029, + 2010 + ], + "commit": "431b3b1d7c4310ef09ba16adbc870bc0af2c0e9b", + "sha256": "1zizjq3cx5y7mdgapm2kzc4bs13fcg55nay996350ha986isa834" + } + }, + { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", "sha256": "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc", @@ -50204,11 +50226,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20231108, - 150 + 20231112, + 2012 ], - "commit": "fb0ab4b1e95a6ba97c09ff072fc91ac7c7f22afa", - "sha256": "0vqxf5zfsaa1ddqp80fhyyfpgpi5my1dzxpsd9zzbf7cma383r00" + "commit": "c1091d25db420320de4b121baba99d7ac2e23932", + "sha256": "0b9fcj7zkqxj5928038gnk93shi7k4mpikqir80lypbnnbn96l5f" } }, { @@ -50275,14 +50297,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231108, - 2129 + 20231113, + 211 ], "deps": [ "transient" ], - "commit": "0109d0d1c067aee8fc3228f1f34d766043258cc3", - "sha256": "15lwqgydkzqc4zp9dfyiqlphm14pr5f588gwi8pxw36dmpgik927" + "commit": "17a58d38e7299f254d02c29bbcc9211146394758", + "sha256": "1cy1kkbg477dnf8lz137h7bc7hvm3apvxdq3ycqifwwhfks4cyk4" }, "stable": { "version": [ @@ -52081,19 +52103,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20231026, - 1602 + 20231115, + 1812 ], - "commit": "ef3fe51f7c207db3c55b9a3a720b3af665d2e606", - "sha256": "15d4wkpv35bbzskiwia0jzl9m5pvs5pl70qs6np6yz7hwq4c524r" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" }, "stable": { "version": [ 17, - 4 + 5 ], - "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", - "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" } }, { @@ -52408,16 +52430,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231108, - 1729 + 20231114, + 1504 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "2534c228ef6699cb2588349c44627835fc444278", - "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" + "commit": "74887ba26071fba4c66ac3b4dc11d7d632832394", + "sha256": "1gyd03dln19cjwgrh3m72qik77hdc2waiv61knzk30pq3dds965j" }, "stable": { "version": [ @@ -53269,28 +53291,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20231108, - 612 + 20231113, + 701 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" }, "stable": { "version": [ 0, 2, - 7 + 8 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" } }, { @@ -57944,26 +57966,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20230517, - 1404 + 20231112, + 1536 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" }, "stable": { "version": [ 6, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" } }, { @@ -59309,8 +59331,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231108, - 2105 + 20231112, + 920 ], "deps": [ "compat", @@ -59320,8 +59342,8 @@ "taxy-magit-section", "transient" ], - "commit": "0bb8c90827781241b7c04904e7a348133e084453", - "sha256": "1y8c8dpzj4fvym2sk3ci0sdrkm70w9anyvgpb6q2sa5b25hwgm7f" + "commit": "8aff760d4a8d3a172a6694e1816f309bac1eac95", + "sha256": "0zml0m0y5k1bs6d627f0la9ax9ag74rmxpxzwky5v8r8zqclynfa" }, "stable": { "version": [ @@ -60423,15 +60445,15 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20231110, - 851 + 20231114, + 928 ], "deps": [ "ghub", "transient" ], - "commit": "92e3c429c0da07025624cceb5796ac41edf753e2", - "sha256": "10hw58zln8x8kjyzmfl1vfqj5mqascix9c7rdq884f8ypfynx7p1" + "commit": "7a72a4ea40668a7c4f0f8d60990a5ac298429936", + "sha256": "0v02cjjabm1f14bvhqp559xfv14my9ibjyx2gh3kzb67lhsrlcsr" }, "stable": { "version": [ @@ -63689,6 +63711,21 @@ } }, { + "ename": "jack-ts-mode", + "commit": "d01c726fc20b97e6127603f7bc347a5cf5e21cf8", + "sha256": "12lih23ci6jl6hqg9lv3cfdadvg60k1j6hgxk8w1x04677ri73nw", + "fetcher": "github", + "repo": "nverno/jack-ts-mode", + "unstable": { + "version": [ + 20231110, + 1615 + ], + "commit": "f57f211d96608a90142619a925caeb8808e7c632", + "sha256": "0zvd2xxv5wsljbvpzp7i121hgj7mnlgjd5wjblmf2hhx49al5n01" + } + }, + { "ename": "jade-mode", "commit": "877b5a3e612e1b1d6d51e60c66b0b79f231abdb2", "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94", @@ -64412,14 +64449,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20231104, - 1427 + 20231111, + 850 ], "deps": [ "compat" ], - "commit": "6f6108896744d1da4887b08e4fe4fff403ac10ac", - "sha256": "0jf9p75r13p28n1kv9w85kk9n3nfp4d8p34y76n3rqhh3sib2asg" + "commit": "25279e36701ad0bea1331ccfa009c07fda2f85d0", + "sha256": "0z05znl1cb26j67h7g0wlfazn9sr7p5j59mwdayy3l9157ic6b4i" }, "stable": { "version": [ @@ -64561,19 +64598,19 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20231110, - 1253 + 20231113, + 809 ], - "commit": "cb3185081cc8eba06de30936efa227639fb8a60c", - "sha256": "0805nvz7kssjm3gahm9g8s25by44dm16anz69087jqfkdwxly023" + "commit": "d9ecbd2f1ca15c90a05f11441886ab2e66b9a51f", + "sha256": "1mpqr8ls3xd8iirnjsk2rg3ibr13n853dj3y0hr6baddka1hydfx" }, "stable": { "version": [ - 0, - 8 + 1, + 1 ], - "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", - "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + "commit": "aef9162171118ef8e6ab411b26b763c9c6ea9e2f", + "sha256": "13xa05a798qbpxgkidvf42xxvi582n7sblwvv9kx0b0glclzkpb1" } }, { @@ -64669,11 +64706,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231025, - 2319 + 20231111, + 208 ], - "commit": "b1abef71843dd99349133a75245804aee503c05d", - "sha256": "0xjmpk33rhqlw5f9qjhmyc057l8rbrrzhz460zsljx2wm11cvp6d" + "commit": "0201e351ed0074a72c0987282079c775f3c8fe52", + "sha256": "157f300w61dq9s11f71p4z0nykg8h1f64rnpy3199y6sfjhhglyl" } }, { @@ -65522,8 +65559,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20231026, - 2200 + 20231113, + 2330 ], "deps": [ "dash", @@ -65532,8 +65569,8 @@ "s", "spinner" ], - "commit": "97ca00411e16a2c1815090ca5aa05b3a36776a75", - "sha256": "168x8g2m30ci2msjfk09bbczpa33h4ax57b23hcwy5czk9511w70" + "commit": "16cf8ffafe5ea0925beb97e37a64eab58b2ad95d", + "sha256": "1231rkk629dqi15011bjslwvspvlgnx74xm2q9j1y37ql4zxjx2n" }, "stable": { "version": [ @@ -66118,14 +66155,14 @@ "repo": "Meritamen/kanagawa-theme", "unstable": { "version": [ - 20231023, - 114 + 20231112, + 414 ], "deps": [ "autothemer" ], - "commit": "08debfc56e052ed69c7ecc3b08c687bb5af4a33c", - "sha256": "1mf4w05zhmhdrknfnpfrcvc3126i3vqcsyjwp0n83km1d8wcd1sx" + "commit": "692cc627ccdd0595de3bbc67e313a0363002e444", + "sha256": "0abckxxifh5aw55wk7ykfxi6cm4rd6ya0m8pql9591lyxfi5whxw" } }, { @@ -67406,11 +67443,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231110, - 1334 + 20231114, + 1243 ], - "commit": "b9ccc4896c8af8e8b60a26eb16fffe8a185551d0", - "sha256": "1dy1j72i8ymxlvhrbh3k94l90p3vwfn8bimbrlw100aqz41nz2jd" + "commit": "9688741a59a5ffd71850660dd320b0309a2ba119", + "sha256": "1gxj3fys3py0ldz31f8frmj12f9jyyqj9g8valsy2c87qvg70ag3" } }, { @@ -67543,8 +67580,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20231013, - 1753 + 20231114, + 1528 ], "deps": [ "dash", @@ -67552,8 +67589,8 @@ "transient", "yaml-mode" ], - "commit": "b882de32b6f6a6ee371eb7a7a308f3936031e681", - "sha256": "1ddavmfyyd2rxffvb3cbv28dxrjsa58jbywzgplnx6zyv05frx44" + "commit": "4e3d362b2df2307f7b13140810a3142b835bc9ff", + "sha256": "0lq0c5dd63d19ziw16cfhhzk4z3vjqal1vqjflvdrd2xhdzjk0xn" }, "stable": { "version": [ @@ -67835,8 +67872,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20231106, - 1250 + 20231112, + 2208 ], "deps": [ "f", @@ -67844,8 +67881,8 @@ "request", "s" ], - "commit": "c79bf975ad799e11ead0e2f2ca909222044b35cd", - "sha256": "1n9xnpz6yv7rczl0cjk7qd5962swcf19022hpaf46kva2sw43333" + "commit": "9f0f738c46712f5365d9d75c37ce6d1f8b6e9ba7", + "sha256": "0k54x2znxwq3ji8cvxc37h9fnr0krpyyx954f106fa7gylp86kz4" } }, { @@ -71687,8 +71724,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231110, - 716 + 20231115, + 1221 ], "deps": [ "dash", @@ -71699,8 +71736,8 @@ "markdown-mode", "spinner" ], - "commit": "3c1c583b549d81ab8e23ddd58b0a7f065e6b6f2a", - "sha256": "0di1hg5hxm6ybqz063yjj6b9rpjaxgqgia6k753hyp9p95c0619y" + "commit": "91dbd0240afb5223b2ddfca8326d1c2fb3e8cf7f", + "sha256": "1anibzm7w9arzqpfm6p01v0522j022g2mwa01w0p1idwg6jjiivf" }, "stable": { "version": [ @@ -72638,8 +72675,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231109, - 935 + 20231112, + 914 ], "deps": [ "compat", @@ -72650,8 +72687,8 @@ "transient", "with-editor" ], - "commit": "02630b51896929011a420d9382779c98ecaef687", - "sha256": "06cnhwzxjpqb29km9nxjynapxiajaa87s7q32c4igq4yjp3jy0h0" + "commit": "f4ff817cb2a48f0f7887050c3be469c03a059567", + "sha256": "0y0sfxky27yx0wsxfbqydigm2x4596dyf1x1psn66gfgjm9yjcff" }, "stable": { "version": [ @@ -74058,6 +74095,21 @@ } }, { + "ename": "mark-yank", + "commit": "d186dbd15e567113418449cf1830f7a5fc342580", + "sha256": "1vbqvw55bzvfaf9nxy3bvp8gzg0hxag7srnjyxpy2a1jwy5crq6i", + "fetcher": "github", + "repo": "mkleehammer/mark-yank", + "unstable": { + "version": [ + 20231105, + 2027 + ], + "commit": "7207aabe9edd0872ec6d506a58b942b43926c122", + "sha256": "0r94mm6x9n53ck2gqbrmi0gdahf1xyhp09jpnnv3m1klhi4hwbzg" + } + }, + { "ename": "markdown-changelog", "commit": "1ca43b6cf089d7c75b1fb483d8356a3ca7fec5bd", "sha256": "0cnp6yfhsixl9nl7l6aa9vrnz71ylf6z25hmk7f6w64f7nxsdmr8", @@ -74800,14 +74852,14 @@ "repo": "knu/mc-extras.el", "unstable": { "version": [ - 20181109, - 1735 + 20231113, + 1359 ], "deps": [ "multiple-cursors" ], - "commit": "053abc52181b8718559d7361a587bbb795faf164", - "sha256": "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481" + "commit": "abd98a7c92e71d38494a6bf20853f3ff20e1f013", + "sha256": "0zv8cxhyqkxc3gyyzd18zygjy0xd3fk1x3v5h24yr998wg0fb050" }, "stable": { "version": [ @@ -75188,11 +75240,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231108, - 1124 + 20231115, + 1306 ], - "commit": "f46ebad2216460cf58293b913bb76c5e9bdc968c", - "sha256": "1wirkcwi21s8z3210h9fwqbman2fg2366b05vgmgasphirsjdsw0" + "commit": "53eaad5df01bbdabc9e655dbadebc302d0475f31", + "sha256": "1a2snly1iraxmyal8f61jj0zhcywmyzq6gglf1fqmmcx3xpv8xra" }, "stable": { "version": [ @@ -75931,20 +75983,20 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20231107, - 1317 + 20231115, + 13 ], - "commit": "9d89e352b73ff2222d62b43b8944206582723fef", - "sha256": "14gr1fc1bdwwzll1yq2sc5yaadvb4360lqypvq805bnnhdjqb6hb" + "commit": "5dfd1608d384be3176c4f06fef908933e2fd4a02", + "sha256": "0pknwad9mm0szb4a0ar7wrc8lnwn45vf3vfq0wbflh6071mdnmkv" }, "stable": { "version": [ 0, 5, - 3 + 4 ], - "commit": "89061feace09249a93e8bdaf2474cc953eee604b", - "sha256": "143i9ih18mh26mdq9d9pxnb468n9zmz2xxs49hgzkpyhc5hdcdy9" + "commit": "58b7c6129f941d4eb6cb5c04525970f8e409623a", + "sha256": "146nlsflzfbsdkwni15vhassq7kgf4xjn7vlwn05v1sny2wpscg2" } }, { @@ -76919,11 +76971,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20231031, - 716 + 20231115, + 1302 ], - "commit": "ff70fd4136df589945d06de6926286d70243345b", - "sha256": "16qr26ihf50w536r6646csd2vxl6xgyyzywn095cxs8mq2qp7jzq" + "commit": "bdb18b2ee27344e44e2a17c78524205d02d5174c", + "sha256": "08m6mzh87q05dx7xvfnyqpj0jsg59g626qq8y5nrnmscf7pf0rkz" }, "stable": { "version": [ @@ -79714,20 +79766,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20231002, - 1014 + 20231113, + 1036 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" }, "stable": { "version": [ 0, 2, - 62 + 63 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" } }, { @@ -79815,11 +79867,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20231105, - 653 + 20231115, + 1110 ], - "commit": "a506b43dc241ee07c28ce815068277084afbf09c", - "sha256": "0jahmqvi0hb8jsraj21d1n6wdp827yak2f4bs9ljpmggqvxp40pl" + "commit": "cfda588dc1e865a8a121b9071f3720fd4937492b", + "sha256": "0cnhcyh7s50k60hx572zz2cq83qjjp72qs6ad9gc6abhzzrzr6bj" }, "stable": { "version": [ @@ -80880,14 +80932,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20231024, - 854 + 20231115, + 2126 ], "deps": [ "compat" ], - "commit": "1fb3271e991fb941e8cc480beff74000e3a08a3a", - "sha256": "0ahlri3hlkrlmm6bh094ays6qrw9yd02rghq0hgin006817r8pqz" + "commit": "722c44210a5f2697f449bd6cb2cdcff638b8c0bd", + "sha256": "109z231gz4afg4z0dzyccsx69znvzwy3z4c5z48441brssvna6nj" }, "stable": { "version": [ @@ -82233,14 +82285,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 914 + 20231111, + 2324 ], "deps": [ "chatgpt-shell" ], - "commit": "58bb4d8eb9218be4925201a39596387d160f4593", - "sha256": "1mqwc2wkz2ax4pzi76vqq59v4qjwp221sw4nw91nr6zbk5ws1780" + "commit": "03f8edabb95c6ffc64050d79fdb3091532711b59", + "sha256": "0h94zdx1nn98pg3mdlj6zvlswmj6i1yldnm1hb9pj2hccsdfj3bj" } }, { @@ -83602,11 +83654,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20230415, - 551 + 20231111, + 1100 ], - "commit": "f0b180eeb5ed19bacbce9d6a39e3123f4751f54b", - "sha256": "03xr38xdsjxlcfbw2637wwiwadymhb60pc9ik0zzk69d2ks097k2" + "commit": "f8e3e1cb02f83624624a4e42070059d91f2e8d5c", + "sha256": "0mb5mmw1110a4czg459c4dl6xj99vzp5vgkhp7kkdgakck0pz17z" } }, { @@ -84674,20 +84726,20 @@ "repo": "knu/operate-on-number.el", "unstable": { "version": [ - 20150707, - 623 + 20231114, + 1921 ], - "commit": "ceb3be565a29326c1098244fac0c50606723a56e", - "sha256": "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6", - "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" } }, { @@ -89172,8 +89224,8 @@ "repo": "ichernyshovvv/org-timeblock", "unstable": { "version": [ - 20231109, - 843 + 20231112, + 1748 ], "deps": [ "compat", @@ -89182,8 +89234,8 @@ "persist", "svg" ], - "commit": "7ac198c48646f864f18aef1c7e55c15ab8d8b679", - "sha256": "0m6gzjzv4criydhsz2s3q1kqc3bs11zg5svgjaksb7piks9368ds" + "commit": "72a72bad4644f7b6045403e93e99d7a362b03b9c", + "sha256": "045vrp9d8d6wnmi82vi337w5w7i3cs0jprwiyhkf033bwvvdywwb" }, "stable": { "version": [ @@ -92185,29 +92237,29 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231110, - 1025 + 20231113, + 1518 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "c541e67dbb7f93b888edac908e9b25813ee7e6f7", - "sha256": "0y3qq1hn43xkmv3x807ja088s75hs06lj8fgxa7a16ifaaa0958c" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -92218,25 +92270,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231103, - 1810 + 20231113, + 1518 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -96894,28 +96946,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200420, - 1429 + 20231112, + 658 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" } }, { @@ -99003,19 +99055,19 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20231101, - 2003 + 20230506, + 330 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "0d3b0c61f4f44c3d8770b89edffe481aaf56f4f1", + "sha256": "06xl81cm55g0dcpfh8b8za8mrs5cgjv656z23q5q0ph3war6ifbn" }, "stable": { "version": [ 25, - 0 + 1 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "7f94235e552599141950d7a4a3eaf93bc87d1b22", + "sha256": "0apvjl43f751iy3472cc17wqmnmzlcgn9sw2wxsmddaz9km7kbn3" } }, { @@ -99501,11 +99553,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20230910, - 1438 + 20231111, + 1538 ], - "commit": "67fd542d9b633d729bdc46fca50a8d0bb6ec6ffb", - "sha256": "06r3i7j090pqgxx40ssix34zbjyzl8mpilwakamw6jlzcdhl4lg9" + "commit": "518a5362870b6ef01d2d4a158bd38c7280687256", + "sha256": "1m7gvizfmvf1f6s4x72fszja90zq7sslmywgihzs7585107wy8s3" } }, { @@ -101274,11 +101326,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20231110, - 1508 + 20231115, + 1544 ], - "commit": "24d59b1546d963c2b92f67a8efde951db90182da", - "sha256": "10s29phk21scdgyyl8ya7l23xr07gm5li7kyni25hh91q6fkldaa" + "commit": "296de3c15580805f2d84dd30e01eb9b12f18bc3f", + "sha256": "1w6pxgmm7s769g7falshpvnb0klql3pz3h9461rvgmvxmrraas93" } }, { @@ -102037,16 +102089,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20231021, - 227 + 20231113, + 1910 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "445340ebc5819eeedd73695c9182349349c90b6a", - "sha256": "1x493djnj5012c7jr29gmzy6sdw7s6xh855dgslr16aqimkz7zg8" + "commit": "365063ea8ce8ec6a852cb388088d84147421c3c2", + "sha256": "1ankjwwsbkv5i9x9dbv0lzbs5qrqb486ds2qymdb0w4kg2g3d11z" }, "stable": { "version": [ @@ -102693,14 +102745,14 @@ "repo": "emacs-pe/redis.el", "unstable": { "version": [ - 20220429, - 1758 + 20231111, + 1733 ], "deps": [ "cl-lib" ], - "commit": "a6ad30d6a43b7be083c13f8725b45571d623001a", - "sha256": "048jvvxb6cskhs95n2ngl4cfgf8hbqidvbi1xsyb0gyzvvqbrhj1" + "commit": "84382456beae70677aed2f9558a0b446f8ccc17a", + "sha256": "0zrjfikpnj6pxaj348wnknv9dnzhzqwsi8b26dbsln5zcwl131jz" } }, { @@ -107611,11 +107663,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230709, - 2036 + 20231112, + 442 ], - "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", - "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" + "commit": "b9f193703f34a5ec923b0fdd34f38b3579d04140", + "sha256": "18sw8whar1r3y4jcml2yjf8symm8a6dvmw9ld80cacwyia3d20fn" } }, { @@ -109321,15 +109373,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20231004, - 1552 + 20231112, + 2019 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad", - "sha256": "14yqa8m44d5qll1fidh0d4g9hmpri8ywxfvgq43bzy00lshnprzg" + "commit": "735258a26bb97e85d25f39e4bef83c1f80c12f5d", + "sha256": "1dxy14dp6z4907vdj5mahj6fxv211rxvldyiq29k494bmapixhxw" }, "stable": { "version": [ @@ -111699,11 +111751,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20231110, - 101 + 20231111, + 59 ], - "commit": "db107d1e9a716ffe531a0f73e7044bb8046d34c4", - "sha256": "13iyxz88ckzydhmy4wgfrfwp8dcj0dgb1rxwr5zcpqxrl1aifpjp" + "commit": "18d7cfd411d79d8bc81027a023c72bae96d77059", + "sha256": "0kj1amrxa1ldc4ss0lx1y2jl4iskg68zm20yldw059gwlg61p13q" } }, { @@ -112450,11 +112502,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20231030, - 539 + 20231115, + 1901 ], - "commit": "eafeda97eb8942e5e2f1fe6ebf7472de9ce405dd", - "sha256": "1myrv3awf8v1haas63fhy7s81jkbbfv6zlbsb2nl8j723d5vm8jn" + "commit": "97fa0664ee4852b18201a3fcac265ac8c52a4a4b", + "sha256": "154r3xrif4nzdqsfyb6skw0ddbi15j1crnqrqv6yclf4s14icz1m" }, "stable": { "version": [ @@ -112991,11 +113043,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230925, - 1808 + 20231113, + 756 ], - "commit": "6d0f9b34eba1abde6ee72e10c2b4dfdd18712065", - "sha256": "0p0pgfwd987ylsm8lhdkammqy6afx2bb582fb3lrjhj27dn572f1" + "commit": "22f449a30d6d36a42c59c1d31e3538aafff19e90", + "sha256": "11pj8fh65wz02q9mhyd4yqpis5n3k2wc919l19ygl4kh5h60ailg" } }, { @@ -114498,11 +114550,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20231110, - 633 + 20231111, + 809 ], - "commit": "970961c63c5949599f684d7b663608e4fe5de635", - "sha256": "02p98bwwwxd7qsxb967y5glgggwh27vh7sc606zy1hyhsx8nkigi" + "commit": "48cc227507c3d079a2ceaf6939406ab158b534eb", + "sha256": "06m2dgfm61iprikv2j0nz63x84l15mzrs0qxn0j3p6flr7aq21n8" } }, { @@ -115569,15 +115621,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20231108, - 717 + 20231116, + 1 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3e7bc49ccd579b2e68d00620424b9c10e38f56e5", - "sha256": "1bq1if84piww0mb9ciji7l2n2ac57c01kb6vldc96imhpri2fnny" + "commit": "08441b4daedbb2688edb2dd3cac0aa71cca675f7", + "sha256": "1fish0g8dvd6m0lgzy2k92g5dk52swynyyqhv6pyj2wjmwb7cx6f" }, "stable": { "version": [ @@ -116871,21 +116923,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231106, - 1400 + 20231110, + 2354 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" }, "stable": { "version": [ 2023, 11, - 6, + 13, 0 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" } }, { @@ -117532,11 +117584,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230807, - 2218 + 20231114, + 1615 ], - "commit": "8207b4140fd1b3eff2ec4b9818e67148139cb72f", - "sha256": "02ipyb19s961k05kmbika302rfipzcgpvm0g1q3pxn7arxs9s3kl" + "commit": "f809e49e8a53fdfd05dd5c345b52588014668de9", + "sha256": "19f47gd1l9wdqxyrmxa7jwffh59s3dz922b4aybh73q9x5db7lbf" } }, { @@ -118247,15 +118299,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231103, - 2312 + 20231112, + 923 ], "deps": [ "compat", "seq" ], - "commit": "b4a29636365d12a8079c3908ff8ffce5f84b85d3", - "sha256": "1ckdjqlp063gprmy74b0ghl9zhwblkahifbqailww1wcbv40fmsz" + "commit": "3cd1de1695084df089cc90cff89b32dfd6ca5a0a", + "sha256": "0j7cww8ip51nqn3qyw027ki7bcg4m7lmh6xxv8ahxsh6mb0iqcdv" }, "stable": { "version": [ @@ -118722,26 +118774,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20231105, - 656 + 20231115, + 1119 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" }, "stable": { "version": [ 0, 12, - 77 + 79 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" } }, { @@ -119156,20 +119208,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20231110, - 50 + 20231111, + 250 ], - "commit": "090a74deeff29530dbc0837ec3151dac8aa497e7", - "sha256": "0gswbpdnbyjp9jb6mgxsws11dp7nxi02w3f4bqc6d2z4zc7fd16d" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" }, "stable": { "version": [ 0, 6, - 6 + 9 ], - "commit": "f0cf4cf93f2877a07c61fb4d10d3fe51be4da3a8", - "sha256": "08kgx6a23a7g941bl6zxmkclwbiqsspx3z2vlpnzjwpqda1b3nxc" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" } }, { @@ -121095,20 +121147,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20231019, - 2145 + 20231113, + 2331 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" }, "stable": { "version": [ 1, 3, - 3 + 4 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" } }, { @@ -122174,11 +122226,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230825, - 2151 + 20231114, + 2309 ], - "commit": "e1e551f6340d58e7782f2c1df7b397229a1c4fe3", - "sha256": "0d22h72mnngi55v1ksa22gwxbyw8flwi6x8wx1c5hfvl59ww8nsl" + "commit": "1edcf0c3758c70acb9393fda7dfbc5957bb0fbeb", + "sha256": "1wjrfzmalkgk9778kc4maz7khq1dli0x27ifyhgi8zvgy899pykc" }, "stable": { "version": [ @@ -122388,14 +122440,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20231110, - 927 + 20231112, + 816 ], "deps": [ "compat" ], - "commit": "0492a686375cec2fab961ecd09f0eecf233810a7", - "sha256": "0fxr95780afcqw9fcc1r4yb3d5d02imqjv762iyqv7iszm61hacs" + "commit": "49a1eb5f3653a3155bff6ff631b336989de61b18", + "sha256": "0fick90jrpgpxsim3n953vbffj572jgxk0cnqlkan5v6pp2px5y6" }, "stable": { "version": [ @@ -123353,8 +123405,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20231031, - 802 + 20231113, + 717 ], "deps": [ "dash", @@ -123362,8 +123414,8 @@ "org-roam", "s" ], - "commit": "f4f220896aaaeee41b2341b74c1b9a554cf9c015", - "sha256": "03yhrrwnm5wgwy2k72cj9bgsmsbm0ylrlnr2dh5rzaaiwxq1kxvn" + "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a", + "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6" }, "stable": { "version": [ @@ -125041,11 +125093,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ @@ -125064,11 +125116,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ diff --git a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index 278296f12d40..57ad28b5b2da 100644 --- a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -28,6 +28,7 @@ in buildFHSEnv rec { xorg.libICE xorg.libSM zlib + libudev0-shim # qsys requirements xorg.libXtst xorg.libXi @@ -53,7 +54,6 @@ in buildFHSEnv rec { xorg.libX11 xorg.libXext xorg.libXrender - libudev0-shim libxcrypt-legacy ]; @@ -95,7 +95,6 @@ in buildFHSEnv rec { # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when # starting most operations in many containerized environments, including WSL2, Docker, and LXC # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 # # But, as can be seen in the above resource, LD_PRELOADing libudev breaks @@ -103,7 +102,7 @@ in buildFHSEnv rec { # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD # for non-ModelSim wrappers. if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then - export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi ''; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 38324c09bb01..42958d277a4b 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-14"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "357fe900baae09e1a3fcef913e49733d05d1f888"; - sha256 = "1dk08b9sb825z18zcq3av3wr8c2xk5szakgiis5c25938jw0c1hl"; + rev = "9fb873af43568464f9a1936fc334dfa3d7a59418"; + sha256 = "0w81xzrvjcwp5a6glyk3dcmghvbb4amlhxbbl71lz9k9w0dzcwac"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2"; - sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8"; + rev = "d82a994d66a9c6c700f240498304bd6d68fb33f0"; + sha256 = "0rjndafp4nz0qbaf614q92zkqcsqmr9i2v1c32q8cm1hxkapaf6q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2023-11-08"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "50e237facda4b9c3761c3f3e9df185cfdf3d91e8"; - sha256 = "1iyxw4j499qwwhygwqspsq5573smrd1rcnyh74vk0sj058d3l03y"; + rev = "1ccd99e113324602b4eca41fd24ba6f991e8f05d"; + sha256 = "09cmg0w967f9x04g686w9s31yz9jx1qg7rb0jibdjv7khyl1cvqs"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -2119,12 +2119,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2023-10-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "a2ff356633bfc2b4638925eee172d43173420d3b"; - sha256 = "1pi4jgc8h48gqdik5kzvlvswh9y9f8rbz6hchng5n5ybnsf3w88a"; + rev = "b8bcea8d40866bfa33a7f7b24979781039bfc76f"; + sha256 = "1jiqpgz31whbplv1hs10y8ais5vgya8sz86ahfrbj4c3w34sxvry"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "4524a687107c6e598017dc7356b7cd1eb046aa71"; - sha256 = "02waplka03ghpxhwsgjf0z4iv6dqkcrg2whlha334982q57gml1w"; + rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; + sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2444,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-11-10"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485"; - sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5"; + rev = "406295abeb7eedae3bcee3f0db690ada605c629c"; + sha256 = "1kiw5vkx3kqd5niyjnpimihd0cb5w8fz8pyq6sfh5am7ycvg5nfj"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -3046,12 +3046,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-11-14"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "c8a209ee319bb93e41e4daebc02eb1614409c350"; - sha256 = "16kcqjzi68mmfic13jagv2glnlg9jg63n8ywixn60c9h8cd83gk5"; + rev = "d308748aa5ea44e9df35d2f5333cd2de148fcf3c"; + sha256 = "0zymllwlf4kvrg3ns9ygsxj44z3yvvcdb8srigx2ffhjgqnri0kw"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3131,12 +3131,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-11-13"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "9bc2196b24a38ebaa16fab25d63caa38565410f3"; - sha256 = "0pnmk7zgbqhxcnwby7x3s1ryb0wx53m2i9ifv5lc1yf7ns71kcz9"; + rev = "ed7bd2581318aebc409f54fa4756023d2e6fb7d6"; + sha256 = "1pbq011s78pq2agjy7gkqkzn9zr5slnik1m5h8mplz9bb28pjb0a"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3300,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-11-07"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "62a9f4fd4fcf46cb87b7868323a1e9aef5b08028"; - sha256 = "19bhhdkqx24jyz1xc7v39563gqa7y8y2aai4pgl7n5mbrvcr9bsy"; + rev = "8bfa1a88d19d86756ef468ad2e499e0337084317"; + sha256 = "190rf7v70jchjj4vrg7sf8ish99kf9n3jqkb009hd8kv68j65lpd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3637,12 +3637,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-13"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "03d8c35bf7b0541a877348cefc486dcd02142ec7"; - sha256 = "024cf9f73f90qfhcr3iqpcwwbxgm1k6a3hn7nl6ndci7mfbc4xc1"; + rev = "640d6415baf6b12c20c16fdd177f106c5575d6c1"; + sha256 = "1yrqa1zj6jyf3r6cb6s06mxk6fb4wwdzw08x454f9amw93cah25m"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3805,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-10-26"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "af0f583cd35286dd6f0e3ed52622728703237e50"; - sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86"; + rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; + sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4045,12 +4045,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-10-27"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "8cc4dec29a177cb7c33a900ccf45b451684c30a0"; - sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k"; + rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5"; + sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "dc778953e98bf2667424d93dad82eefe319e0f7d"; - sha256 = "18qc0xcdzg914bis9djz1gd7csalqzvlqbv2nd7v02pm0gnw7fbj"; + rev = "88c3ddac1885f3ee0e9b4664296b10d30a04c731"; + sha256 = "159rr16jic7cwc6ai539a8gvzjr2klnmhdyyp0c8nr0jl298y3cj"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "db0acd3a3445b26948e754dbb35a4ede10c31d30"; - sha256 = "16rph1lwqz4i78qz30l59kwzkndcsfpcc5dzcpw5rzlhq1zqcssy"; + rev = "cf58d40c90a36c2b2ec6629e84bee9617a7a31c6"; + sha256 = "0dxyvf6yrdvl0hhnwzsa9im20r100kr4dsvrfa7djbib1n8qvy65"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-14"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "4c1c903268b42a5b83caf229ddda7014a6a2e0bd"; - sha256 = "0q6315nx7dailivvncvg1hiwjk910djcwjm5arqd0nq7099d998p"; + rev = "2a4975130a39d9317595bb356b2ff5663f7d8a77"; + sha256 = "1r785mgavpc54lr9220n80mp8x90j20snwzicp80ahn407vs10n0"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-13"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "2c896afc38b1e1d39118318d581850e2d3ad8e7f"; - sha256 = "1n9f4hhi55imk53hzzxsypxvsymg3avj9xnsxgr1bl12xyjbm9gk"; + rev = "47ff75ce2fcc319fe7d8e031bc42a75473919b93"; + sha256 = "17ab2q4xq1phhn2pxci0qjib1fjr5yl9lqpwf2sy49plhg7ix4zp"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab"; - sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs"; + rev = "8055851d16831370f5249c30a04f2eafcb0b76d3"; + sha256 = "0dk9r44i9anrjs84s1139vcxmfpw006cqbblis8lhbmwa7m6vhkp"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "4d85d4ad3ef6ba9ad0fffe478f834c29b5bfa57c"; - sha256 = "07jpv90i1xrns6hy77pbyilrxh7ad8i1h0x2x0w6mmv395gysxvy"; + rev = "424503af246033f177a11c9959424bbb3640f077"; + sha256 = "1ykncpyd7yf73clxifcjsm1lvsy8mzy84j5z203gpl2zwpcnn1sc"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5424,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-11-14"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84"; - sha256 = "1kq88b7q8kskigpizk432h4r5gf8k87f3zrnxz2pyvrwwg7vpkmp"; + rev = "ab640b38ca9fa50d25d2d249b6606b9456b628d5"; + sha256 = "16lc26ypiq29jnmxdqhvlj30q1lbfin89cdahchils8fir6pn3sg"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5472,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-02"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "eb52634ec1f6cc186f85640ae4bf3ee80bb10551"; - sha256 = "1lb58jxkz2kzf0zqbba3znxckadi09yna9lmyq3my59xzkaqa7p4"; + rev = "a74108b417cff78d15074f6f68a8f997e718f404"; + sha256 = "1vfndgk09kvrwj3kviff4c8wsi8gd7pym5wg0r17jflmqr7y2y5m"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-14"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "abd7aa3ec50350ec3c986fcdd7328e3d23948b89"; - sha256 = "188dqyddsj2rzz212n8kswxqn8mxa0n38j681r912z4yf4vbmjqi"; + rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9"; + sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5628,12 +5628,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-11-14"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "91ec70b710bc8e1de59352b1ecfb4cdb6e786c92"; - sha256 = "0h3xg8n5asya98lyly8m2zgkkg1llxji3fx6fd4i6yym42c3awv0"; + rev = "413d0eab0d37d770759b4e2aba9205182fa796da"; + sha256 = "0xaxiqdf99901fpwv7h4a03k7qfqdnr9rfmrj1yx6rcai2yiwxyc"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -5688,12 +5688,12 @@ final: prev: nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; - version = "2023-04-22"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "jbyuki"; repo = "nabla.nvim"; - rev = "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e"; - sha256 = "17iw6ca9b8mrw68f4zkghnf3if76yrpj5fn8cp8829zpm722l6b1"; + rev = "f5aff14fa3d60f4be568c444be84400812823648"; + sha256 = "0ynqz7hmbxswxlnw411ah6n1bsd6saq8l5s8lrmbfas91zm5hy0x"; }; meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; @@ -5940,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "f86e871584bd3c5a00b4ff8344305889eb52ebff"; - sha256 = "16v172gmr3clr8mnw1v767ln6qidalp7qv6xsh10ylnkzygz9lin"; + rev = "230ff118613fa07138ba579b89d13ec2201530b9"; + sha256 = "13ma0zh6jbh8dbinczbanwf1jy20sac9qxx7v9h174gbyzpc079m"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5988,12 +5988,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "b2881eeb395d2b268de5fe9b5e201a8f1816beb8"; - sha256 = "02wnkbcvcpsz6dy855c1c8l0cz7178qaqddvmmgqfpzi1dfxn4q9"; + rev = "627b5b543f4df551fcddb99c17a8e260c453400d"; + sha256 = "0b3cv7w6ic9wbfnr11p0f1dnfzpwlnx10lw6wyhlfg8mwx8dvksb"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6024,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "296570589180d9428539f5ac099d7c8b9f4ad489"; - sha256 = "10b9jl17kb6lnlhgm7lblf08qh3q8ymhzzv7w1p4hz786hrcgi53"; + rev = "987e415247547a372d0356f76444cf402436c727"; + sha256 = "00ppnr40s8lhlvga1m87xgwrdnyzj6as4522jl0n31lx7f90bvpm"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6096,12 +6096,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "d5f3ad064918cf19dbbdfa77817d162d4de6a461"; - sha256 = "1qaghcfmnyv8hcmnbdrz12x6m92lxl9n3mxbf6vqmqi9ivdr63h1"; + rev = "095fad9481f5a678625a99dc06e9991c5d11efc8"; + sha256 = "1wqdhyr4z377y2gjlc4vg0v9wnnxwyxbcj5ahmihj1nfwrj1l7pa"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6241,12 +6241,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-11-14"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "d0d9fa025056d4a8124e7bf34a3b0b7942870c84"; - sha256 = "1f4w2lyjj19piw0pn9456ilnw4g7086641z73f6msvy6fnxggp6l"; + rev = "9bb7981e4753daaf705350b3d98305a488b82dff"; + sha256 = "1q229xqsv9in0n78hpi0sj6apqyzs9iqbhwnh57swd0v4x85ync6"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6601,12 +6601,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-11-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "e5abf91b410e28e823b26fe9141287fb416d2dee"; - sha256 = "1bx8aan45sipqpg0yh4idagqhgn085dnnzgb051jzdwd6ja0hisv"; + rev = "fa9be1679db7bf57d44128a018db43da5488a07f"; + sha256 = "0cqmdkxksridq4qgdfjcvinqq274lqidpblgijv5iqa14zzng0b0"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6937,12 +6937,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-11-08"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9d81c11fd185a131f81841e64941859305f6c42d"; - sha256 = "1pwn5c0hjm3wpzzybbakxgpq4bd7f6aygvslhivi4inzn48dla90"; + rev = "e154fdb6d70b3765d71f296e718b29d8b7026a63"; + sha256 = "156hp1i8vm0fpy5vbcx0ihazblnly72vjsiy8bf9f30i9rvq9knv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7188,12 +7188,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-13"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "4f2d968a827d86bb40b7b1fad28c11f7b764fef3"; - sha256 = "0i60lyzhhnpzxi7k5dy4xacsg8mmc7ac8f8xwlbv32h8jqrblsab"; + rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39"; + sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7224,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d5d7412ff267b92a11a94e6559d5507c43670a52"; - sha256 = "1jqpsj2in41fv148zdvddpcwjzmll5kchzx9mnbas685xmzc4h0k"; + rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43"; + sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7284,12 +7284,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-11-15"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "96d0c8ded6c2b9e66340c1e00d5a62acec112711"; - sha256 = "1ml08is8vn49d7bbzlhfdxfa6q8c9hjnfxrsaxqbgkhgnw7nakq5"; + rev = "a3a75d094cc880dcd1fd9745fea2f0cd84662110"; + sha256 = "0zjlcsmz3381ir4sl2n7r2b91d7x5hp12g03v27y381p9q5kg41y"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7404,12 +7404,12 @@ final: prev: nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; - version = "2023-10-27"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "3f4f176a6dd50c8588cfbe1b0e9cbea39018003e"; - sha256 = "11mrgrdhcqsw1xg9pldby8gp0wpkmbcf9c9nbahxd73s77b5a0b4"; + rev = "ba0e291cb5c0249838132e197dac082777bdc7d6"; + sha256 = "079w1n62dr8fyn3c6594dgvm5546c2lmaka4bqb1dxkmw9pfqfa1"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7452,12 +7452,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-11-13"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "642068c7d6d98e019a3e1db7c7b4876373347730"; - sha256 = "1zi3kvyxb3zyni5dj9kmi296r303bskpcdmsi3a4r9a3pryl4lhr"; + rev = "74ab63b598cca206888e83090ed6312aac324b4c"; + sha256 = "0habi91wq7q6i49x20ipli9kd84iflpz0wb2lfwnmhii1dfvmifh"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7572,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "80cfeadf179d5cba76f0f502c71dbcff1b515cd8"; - sha256 = "0fmmfhzl8igk3kpk34cs0wvw4lyhjvc83cdk225gs06awqr24i3m"; + rev = "46e1f776f0a714099b9160604fbb62fba2540376"; + sha256 = "1c3i4hzr68izlk3r4lain0v1kqh1l078gc8bf8mj7vgwa67mplj0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8b9f99660294dcd11d42572c84ee33a1e284f70d"; - sha256 = "09mkkkirp922018dvci32p9mfsa2fqkv9b6nd1srwicxydx1wzp7"; + rev = "d87629647614b779fb2aad8f0042fe2864253ea6"; + sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977"; - sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv"; + rev = "f3ec0d8a1b4e07d7ed2da6b9a9f10864a83c4be4"; + sha256 = "1kbx404z9ziy2ylj9qkmrdkhb4mjhvijnrb29hdbjh1hymhghxzp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7680,12 +7680,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d"; - sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s"; + rev = "ead792ccdace6a9d64a8119909af243ed0105465"; + sha256 = "0s55gcdh6yi0mpszqaj10sm25nk6wichli6zavs7ywg29nfxl3h8"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7739,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-13"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "11eb26fc166742db8d1e8a6f5a7de9df37b09aae"; - sha256 = "0xshsc1wxgsvdb09klsddz0ipf43vimsya4rc4zi22xxjgj40dyh"; + rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4"; + sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7920,12 +7920,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-11-12"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "89888840309a813ef6911e0150a0c6aa66c2ab5c"; - sha256 = "0648dilrk31yn2c8s581c62j9jk30cnxf6h4f2pcddygs308pqn8"; + rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea"; + sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8439,12 +8439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-10-17"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "14a80ffab90567e360eb97b19039c4c16913ad79"; - sha256 = "1ak24ydzrak1al1nf6kdfjivlfh03hsyibyf7x1gnzwgm35i1v4a"; + rev = "4e9910b1c4cbd49d8ccd001e7a59b700c57cd71b"; + sha256 = "170d89xh104fzcmnd8az65jvdr2bs3lyaqw8icpbav7vfi7d099a"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8511,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "ffb31befabb165812360ba70072e04c2101317d7"; - sha256 = "1a4gwggn131zyiigv7zvpbriqs2f2z7kslds9xpc6rgskd873kkd"; + rev = "072210357169394dff90d30ccfe0ac92530a9317"; + sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8762,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-15"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "3f0217642bbcb4179772c2bfd124fb808371be2e"; - sha256 = "0lqvggbrfmf96cz6q2jjdic67m9j7ap65va7j0z4jm2rfndany70"; + rev = "540ff82e5f47f3e39bd583acfbd813f4ac90d4a6"; + sha256 = "096i4rrs2yjrhixwzcwh9ppiq5cjdvn3in6b0m4qh9wk3i0kxrvx"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8954,12 +8954,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2023-02-25"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "eb7f35f6a652f60d3b4f262d64d4846adbd4d104"; - sha256 = "0n3n80sq9kxamih47q1z6lsbh7adic612cklikva379kqygmvdlj"; + rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b"; + sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -9051,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "e00e423a5cc4637fdcea79435086736f6ae85182"; - sha256 = "06hviy2f6jawhdcjfhd5hkkjwsj0bnaz5cvmf76chccqr24851cw"; + rev = "149ad2d3c297a11135322d00a2a3cef35911b278"; + sha256 = "1lkcid96ngaw1yyyin639x1icybd97g7016m9n4y2xrmkdbx32h4"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9219,12 +9219,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "8b00772a03c416d23954baeff8a32154bb626293"; - sha256 = "0anb7bh08n4aj6x04v3ys35sl6b4f1lc7026b3pc3i6yjivnq9k8"; + rev = "9531bfb26257f0d06f7ea2b7ecb4f13095d430ab"; + sha256 = "0k1gm1qijdwsrpc0rd6b1q71l6gi2hr8sh6nfslah3dgncgpy21d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9352,12 +9352,12 @@ final: prev: substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2023-10-11"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610"; - sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h"; + rev = "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714"; + sha256 = "0jf6r6zxgr4709lfl2ry7z8qh4zql8w4x56bqj0jfkga35l9c7c1"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -9715,12 +9715,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-11-12"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "da2a20ccaf39ce04b92178711a2db175ec0a87d5"; - sha256 = "1k7sp1xcrr2wlkjrs7aqsnxjf7sp9ra36bpl1rn1dfmjyd949n6r"; + rev = "f41675fddb1ea9003187d07ecc627a8bf8292633"; + sha256 = "05qvb1fsnby5c5x5my601lavbk3m9w10dnq6i55yp42ksrk8zjki"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9896,12 +9896,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2023-11-12"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "13c33c173e53f14df7eec5155c52a3d2ab022d8d"; - sha256 = "0bc3c447491pbp6l20gn4kwd9n7wm4ayac0imsvswpmnvlrh0ibn"; + rev = "d3afc1c105535a90caec092ce27a113f77ba7b84"; + sha256 = "0cpkjl6pffwdrh1hawpd042gpnyqbg2r8f1nz0fwdk175bgsx2s8"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -9957,12 +9957,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-11-15"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "721cdcae134eb5c564cb6c9df6c317c3854528ad"; - sha256 = "12kizqyhknpp4931n2fkbdxhb04afpcnxyw6s4z7mf1vsfjz39w2"; + rev = "18774ec7929c8a8003a91e9e1f69f6c32258bbfe"; + sha256 = "1vihb6l5xiqbrs1g4c1blpkd0c995hwv2w6sr5b86zzmk70g0c7k"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10065,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-14"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "acd6178ffcf728c82036c7064630ff40f4c9ae82"; - sha256 = "03r9znnrgvc374k71wzjyr69ifpmbgpwx9n8xmrv3f0w6kmfa1y1"; + rev = "65fcc8fb79ceef644af6861558bb534562ef6c0e"; + sha256 = "12dhchvn9mgs3pndiq6bnjn44ixx3famf5ad3vhhw0h7331p7v9v"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10342,12 +10342,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-10-19"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "102ba313f87e1f9f9864f681dd7779cac8f6d3ea"; - sha256 = "1sadhwdwcdb5qibp4xsw1g3skfgyq6rv86cmlb15ys6r4dv0lyws"; + rev = "11f50fb66132c0bac929533b64536a8a7c490435"; + sha256 = "10dw4v8z8akgbp745f4ir0jnspxa1lji7adpgqa9fvkw78yws1n1"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10426,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-14"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "68d6f93d3bdd3663aee6ec7e16fee4eedc6df26b"; - sha256 = "1kb2dnd5jcwig3yjajjwznmb47llrl5y5jmd33nkdrrmvckb6l0z"; + rev = "fe51253418442af7c5e5884e084bdc574b5be5fb"; + sha256 = "12zpkskk81nagai3rip7ak0k7nz5imj07bphkalchf6lrr464bli"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10906,12 +10906,12 @@ final: prev: vim-alias = buildVimPlugin { pname = "vim-alias"; - version = "2021-05-25"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-alias"; - rev = "9d1a86284c223fad488137075867ba1c1bd20599"; - sha256 = "1fqa39j3ax7cvj7bn33r545zwbplmf4b6n7z5jgqqn8h03hsq7x1"; + rev = "4fb8430816ecd12952c44bf1891ec554249f21b3"; + sha256 = "0919drb2ml1xfm3y2g9nvqh6l3n2hjmsbrw6g72lgqh7l02xlalz"; }; meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; @@ -11590,12 +11590,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2023-10-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569"; - sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z"; + rev = "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2"; + sha256 = "07shhzgg5f4zci1md5gmns0h4xq3hxvak4c78glm807kcw22rj70"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -12876,12 +12876,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-11-14"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "8fa4691bc3b593b6deaf885a3af80aafb12f338b"; - sha256 = "0gic7vfd3jbz5pwn0cchhx4xs05vil590mc90kfkvf97ksr94965"; + rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a"; + sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -15242,12 +15242,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-11-02"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3c6c5bf17f4ae6c53396667ce3405df02a80b894"; - sha256 = "0n8db9y20fmm4zngmhpnr3pcpjrm78071mmq96wx1nfgn544hsld"; + rev = "87c6861ea81700ec4a6a27c81413cf07cb2c883c"; + sha256 = "0j2rnrz2cx0zsvqbx4glpdij89nbxwq6iyb385jvv7lhm4fyary8"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16024,12 +16024,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "cc717acba29259d578548973c41448b092453c52"; - sha256 = "1jbyvd5w06hppwpvjm2sd01qz3phw7ds5n7w220x8r2vslpmm25l"; + rev = "a8dfb969e76d1a0752d98b5347be9ffb9bca9592"; + sha256 = "07xmcvb06w4khjc2z8h3i1c63fhkk4d76xjzwxs8lhzwfm4w3n86"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e0c0f05bf30e..3e80713f8871 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -160,12 +160,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=25371f9"; + version = "0.0.0+rev=212a80f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"; - hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc="; + rev = "212a80f86452bb1316324fa0db730cf52f29e05a"; + hash = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -292,12 +292,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=d153fe1"; + version = "0.0.0+rev=a714740"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "d153fe1c3385ee0521730ff4e0be9358e903b322"; - hash = "sha256-zxAz82XpTtKondA84L1sO3VByo8vLI4j154pWbxlV74="; + rev = "a71474021410973b29bfe99440d57bcd750246b1"; + hash = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -326,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=3161aed"; + version = "0.0.0+rev=d33ee2c"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "3161aed045130c900f870ef53fad93a574317769"; - hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw="; + rev = "d33ee2caab572f7b46cef12e090331b9ed1c02e2"; + hash = "sha256-9fQ0z7DozjGdcQZG36w419mFXIVDeafkG+ciQHgh0EE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -736,12 +736,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=bea82d3"; + version = "0.0.0+rev=c9082ed"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "bea82d337801e472e35b5cd08038afdf13263768"; - hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE="; + rev = "c9082edab87b145e97090b133167cb53626d9f58"; + hash = "sha256-bwuPykagBFfTJ87C5oNcUWmKs9eBBYPZ0UOC/8zbbF8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -901,12 +901,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=fdf6463"; + version = "0.0.0+rev=e135399"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"; - hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E="; + rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; + hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1229,14 +1229,25 @@ }; meta.homepage = "https://github.com/r001/tree-sitter-leo"; }; + linkerscript = buildGrammar { + language = "linkerscript"; + version = "0.0.0+rev=f99011a"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-linkerscript"; + rev = "f99011a3554213b654985a4b0a65b3b032ec4621"; + hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-linkerscript"; + }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=b35882f"; + version = "0.0.0+rev=91d2708"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "b35882f2e1460867ddddcbe8af586e6807d4676f"; - hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0="; + rev = "91d2708e12a5869154a85190b13ac89cb1414189"; + hash = "sha256-2wnGHQXx5QHkXSBsxjULIRlbXj7CBxWxFjef3n9lmew="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1611,12 +1622,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=33e3016"; + version = "0.0.0+rev=0a99dec"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"; - hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc="; + rev = "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"; + hash = "sha256-MfCws6WvaYJPoxoSdk1OUkqfVGCNtfMDTyndSZpABqI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1766,12 +1777,12 @@ }; purescript = buildGrammar { language = "purescript"; - version = "0.0.0+rev=f89bd14"; + version = "0.0.0+rev=85a9095"; src = fetchFromGitHub { owner = "postsolar"; repo = "tree-sitter-purescript"; - rev = "f89bd149e44624342bf49f76245d3284f2beed9a"; - hash = "sha256-c4Zux+6kg9b9/0t9LOtfSdMMQbp1xwiQH8dz4BBB/pY="; + rev = "85a90951c10f118f819c1137f669800246890db7"; + hash = "sha256-F5xkMYK5WYn+Fuf/vWGaywX+hrjOqGUlg9EjHMS6yDg="; }; meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; }; @@ -1788,12 +1799,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=82f5c99"; + version = "0.0.0+rev=4bfdd90"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"; - hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk="; + rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"; + hash = "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1975,12 +1986,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=48e0533"; + version = "0.0.0+rev=79456e6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "48e053397b587de97790b055a1097b7c8a4ef846"; - hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; + rev = "79456e6080f50fc1ca7c21845794308fa5d35a51"; + hash = "sha256-57CuGp7gP+AVYIR3HbMXnmmSAbtlpWrOHRYpMbmWfds="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2086,24 +2097,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2121,12 +2132,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=9fe5aea"; + version = "0.0.0+rev=d8fffdf"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9fe5aeaa8d58d00cc31c20a3ae923ae695ce2ce7"; - hash = "sha256-HnSZGrxrHlARPhgTJRO6P0FcmjOdB3c5eMpH9+5ZaX8="; + rev = "d8fffdf0902bf55994fd2e8a0a46e221ca988589"; + hash = "sha256-PowCYtL56lLGJaXFEdtPGAXaqYF0/u/mqDCjXHmyps0="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2143,12 +2154,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=6ac08de"; + version = "0.0.0+rev=1651e63"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "6ac08decae456ef2fc307977d9210f86d75d4eca"; - hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw="; + rev = "1651e637d57c667708add5440d3726f07e97d953"; + hash = "sha256-jshQhWIeMcsUA7g2RGuH3DSfBfRhRx9dMOJVm/92Jkw="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2243,12 +2254,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=884a034"; + version = "0.0.0+rev=b904af3"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "884a034e0ae29ce72649041a603deacdfb4a3275"; - hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY="; + rev = "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306"; + hash = "sha256-MGdwcw9T3hemUHfgQmdTp20MW08AQcVWGRHxkP/6N5Y="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2275,14 +2286,25 @@ generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; + templ = buildGrammar { + language = "templ"; + version = "0.0.0+rev=6b9dff6"; + src = fetchFromGitHub { + owner = "vrischmann"; + repo = "tree-sitter-templ"; + rev = "6b9dff614d5bab902cb6989bfcaa180636218159"; + hash = "sha256-89CJkVuNWm3V3Iz8iCx1pLIJwhyPcEfDB3ZqqiwZEdU="; + }; + meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; + }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=fdf6463"; + version = "0.0.0+rev=e135399"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"; - hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E="; + rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; + hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -2480,12 +2502,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=099a85f"; + version = "0.0.0+rev=2f24b03"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"; - hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc="; + rev = "2f24b0377ddb865eb4285634f6945cb4ee3f395c"; + hash = "sha256-DLtG1RzoDC252O1FItP9vDZyt/MpV4bR7tcMSOLINWA="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2580,12 +2602,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=eacf704"; + version = "0.0.0+rev=f6423ec"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "eacf704338661b981fcf4fdb5ee44d898f038144"; - hash = "sha256-JwA49Up2G2/jobjqniQeJ1Rfko3PFfgINRvi/QswlCk="; + rev = "f6423ecace1ef34f57dc77db031504ce21ebfaaf"; + hash = "sha256-uIUIXHxHWedJ5oH1u/88degVAzklzN97AYc5B39nFwE="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 365b26642b3e..b583e8135609 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -20,6 +20,7 @@ , millet , shfmt , typst-lsp +, typst-preview , autoPatchelfHook , zlib , stdenv @@ -2297,37 +2298,26 @@ let }; }; + # Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this + # extension mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29"; - }; - }; - in - { + mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.6.1"; - } // sources.${stdenv.system}; + version = "0.9.1"; + sha256 = "sha256-GHD/i+QOnItGEYG0bl/pVl+a4Dvn7SHhICJ14VfqMjE="; + }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = [ + typst-preview + ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + nativeBuildInputs = [ jq moreutils ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json + ''; meta = { description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; @@ -2745,7 +2735,6 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; @@ -2758,9 +2747,13 @@ let nativeBuildInputs = [ jq moreutils ]; + buildInputs = [ + typst-lsp + ]; + postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json ''; meta = { diff --git a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix index b525d16b390f..f54a1c102301 100644 --- a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.10"; + version = "3.9.11"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; + hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; }; nativeBuildInputs = [ @@ -30,8 +30,11 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro + numpy + pillow pychromecast send2trash + zeroconf ]; buildInputs = [ @@ -45,6 +48,9 @@ python3.pkgs.buildPythonApplication rec { libXrandr ]); + # Workaround for eoyilmaz/displaycal-py3#261 + setupPyGlobalFlags = [ "appdata" ]; + doCheck = false; # Tests try to access an X11 session and dbus in weird locations. pythonImportsCheck = [ "DisplayCAL" ]; diff --git a/nixpkgs/pkgs/applications/graphics/feh/default.nix b/nixpkgs/pkgs/applications/graphics/feh/default.nix index af41424d58c3..16447ac6d4d7 100644 --- a/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg="; }; + patches = [ + # upstream PR: https://github.com/derf/feh/pull/723 + (fetchpatch { + name = "fix-right-click-buffer-overflow.patch"; + url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch"; + sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix b/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix index 0ee58e009c26..0aa5d6b55350 100644 --- a/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix +++ b/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; - version = "0.10.0"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; + hash = "sha256-T5SFcdz5yrInE6+ydJqtstEYF0MvHquRZ7nvlCOVNzE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; @@ -69,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "unofficial Electron-based Figma desktop app for Linux"; + description = "Unofficial Electron-based Figma desktop app for Linux"; homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ercao kashw2 ]; - knownVulnerabilities = [ "CVE-2023-5217" ]; + mainProgram = "figma-linux"; }; }) diff --git a/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix b/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix index c40de85767a3..4c516e3ac82c 100644 --- a/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; + hash = "sha256-vY3BTbCLf3JOB+eILMvaFUIgG3UBkSdckFAdC4W0OnU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/anytype/default.nix b/nixpkgs/pkgs/applications/misc/anytype/default.nix index f17a939b53cf..71af8bc4c432 100644 --- a/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.35.4"; + version = "0.35.25-beta"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU="; + sha256 = "sha256-55VT4t/SNl13Gdh7LG4SqLN9uo0cYDu0LnPFIuZ7Sm0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/nixpkgs/pkgs/applications/misc/clipqr/default.nix b/nixpkgs/pkgs/applications/misc/clipqr/default.nix index f87f971012d9..8e9852334e20 100644 --- a/nixpkgs/pkgs/applications/misc/clipqr/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipqr/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-RIzOkJx1eSik+3N6rSh+3LY2VZmbzNYyV5wpLQHFU2A="; + hash = "sha256-OQ45GV+bViIejGC03lAuvw/y8v1itA+6pFC4H/qL744="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 72acbe02bbae..d4b89db84ef5 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.10"; + version = "13.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; + hash = "sha256-EJpyWuOyUVb34F5Pg8KPF9R3f3VpvZVeg8WBZ1oGbbE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/typioca/default.nix b/nixpkgs/pkgs/applications/misc/typioca/default.nix index 888913dd1e2d..71475cdf224b 100644 --- a/nixpkgs/pkgs/applications/misc/typioca/default.nix +++ b/nixpkgs/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-m6vt4wpLpKJJNP8qCCeLMgNfAAZengDGjBVmFI5ZeSQ="; + hash = "sha256-PVyEvPktb2ortmPf1afk6vXmcp91Zei8BLwGkRazFGA="; }; - vendorHash = "sha256-q22t4/eum/RSWyzVQfJ0VZkEHgBu12nyRgmkJffi7PM="; + vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index c77411b6c264..5542ca62b93a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,6 +7,8 @@ , application ? "browser" , applicationName ? "Mozilla Firefox" , branding ? null +, requireSigning ? true +, allowAddonSideload ? false , src , unpackPhase ? null , extraPatches ? [] @@ -367,6 +369,8 @@ buildStdenv.mkDerivation { configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 + '' + lib.optionalString (!requireSigning) '' + export MOZ_REQUIRE_SIGNING= '' + lib.optionalString stdenv.hostPlatform.isMusl '' # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator # TODO: Default vm.max_map_count has been increased, retest without this @@ -408,6 +412,7 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" + ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ (enableFeature alsaSupport "alsa") (enableFeature crashreporterSupport "crashreporter") diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index c4d59bc2c149..37777f92005d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -56,10 +56,11 @@ }; }; - firefox-devedition = (buildMozillaMach rec { + firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; version = "120.0b9"; applicationName = "Mozilla Firefox Developer Edition"; + requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; @@ -84,9 +85,7 @@ versionSuffix = "b[0-9]*"; baseUrl = "https://archive.mozilla.org/pub/devedition/releases/"; }; - }).overrideAttrs (prev: { - env.MOZ_REQUIRE_SIGNING = ""; - }); + }; firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 68f547d1f95a..25c7ac5bb659 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -115,18 +115,15 @@ let nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); - requiresSigning = browser ? MOZ_REQUIRE_SIGNING - -> toString browser.MOZ_REQUIRE_SIGNING != ""; - # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if requiresSigning && !lib.hasSuffix "esr" browser.name then - throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" + else if browser.requireSigning || !browser.allowAddonSideload then + throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then - throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" + throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon" else a ) (lib.optionals usesNixExtensions nixExtensions); diff --git a/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix index ec00983663b4..004746c2166f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix @@ -3,12 +3,14 @@ let librewolf-src = callPackage ./librewolf.nix { }; in -((buildMozillaMach rec { +(buildMozillaMach rec { pname = "librewolf"; applicationName = "LibreWolf"; binaryName = "librewolf"; version = librewolf-src.packageVersion; src = librewolf-src.firefox; + requireSigning = false; + allowAddonSideload = true; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { @@ -30,6 +32,4 @@ in }).override { crashreporterSupport = false; enableOfficialBranding = false; -}).overrideAttrs (prev: { - MOZ_REQUIRE_SIGNING = ""; -}) +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index e20ad8c68e51..1764bf610eb5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.5"; + version = "2.9.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; + hash = "sha256-5oSuExdkP+69AJD5U74yLD4e+5pvbFOY6T9mcKnJ5Jw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; + vendorHash = "sha256-/MmcWusqgEe8KEJcEBOqOkv1lJb06R3TKYFk4wvdWHk="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 407b0c0dd9c1..ce52fdb6a355 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.14"; + version = "1.15.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; + hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; }; - vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; + vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 638a3089033f..f559df2747d8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.53.2"; + version = "0.53.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo="; + hash = "sha256-UPbiqo0HvBEIAimugNa7WwqwPsLk8C2gS0KqfgFMGQU="; }; - vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo="; + vendorHash = "sha256-h1rDXxvPhQfGUpxOmnksy3l8kMq93nxOQ9adJFyZnOY="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index 3099df6e9f12..ca26ee1c4b3b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc="; + hash = "sha256-E/M0GliZwe8aDZDtuCea5II452Zy9pD+9MmYFSkmjE8="; }; - vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw="; + vendorHash = "sha256-VmukCrEl2hldN0kBgDycp/junmXCZsH+utNJGNjodW0="; proxyVendor = true; preBuild = '' diff --git a/nixpkgs/pkgs/applications/networking/discordo/default.nix b/nixpkgs/pkgs/applications/networking/discordo/default.nix index 87f9c4bbc19e..50112238215d 100644 --- a/nixpkgs/pkgs/applications/networking/discordo/default.nix +++ b/nixpkgs/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-10-22"; + version = "unstable-2023-11-14"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5"; - hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0="; + rev = "002e382c0de1d87e2ce7fd579346da4f339880ca"; + hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk="; }; - vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA="; + vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw="; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 4fd9a36b0f51..3d49f47f8163 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ genericnerdyusername ]; - platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 62f0d3933a30..027564ae7a01 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -35,6 +35,7 @@ , enableCli ? true , installLib ? false , apparmorRulesFromClosure +, extraAppArmorPaths ? [] }: stdenv.mkDerivation (finalAttrs: { @@ -134,7 +135,8 @@ stdenv.mkDerivation (finalAttrs: { r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, - r $out/share/transmission/web/**, + r $out/share/transmission/public_html/**, + ${lib.strings.concatMapStrings (x: "r ${x},\n") extraAppArmorPaths} include <local/bin.transmission-daemon> } diff --git a/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix b/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_5.nix index bf587a4c9bc2..33744bb3831e 100644 --- a/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix +++ b/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_5.nix @@ -26,6 +26,7 @@ , libdrm , makeWrapper , mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -54,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -76,11 +65,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "7.4.1"; + version = "7.5.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY="; }; nativeBuildInputs = [ @@ -134,10 +123,6 @@ let dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner ''; - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - installPhase = '' runHook preInstall @@ -179,12 +164,14 @@ in # In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { name = derivation.name; targetPkgs = pkgs': [ curl derivation + noto-fonts-cjk-sans ]; runScript = "/bin/onlyoffice-desktopeditors"; diff --git a/nixpkgs/pkgs/applications/radio/qlog/default.nix b/nixpkgs/pkgs/applications/radio/qlog/default.nix new file mode 100644 index 000000000000..098b51954a4e --- /dev/null +++ b/nixpkgs/pkgs/applications/radio/qlog/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, qtbase +, stdenv +, lib +, wrapQtAppsHook +, qmake +, qtcharts +, qtwebengine +, qtserialport +, qtwebchannel +, hamlib +, qtkeychain +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.29.2"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + rev = "v${version}"; + hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = [ + qtbase + qtcharts + qtwebengine + qtserialport + qtwebchannel + hamlib + qtkeychain + ]; + + nativeBuildInputs = [ + wrapQtAppsHook + qmake + pkg-config + ]; + + meta = with lib; { + description = "Amateur radio logbook software"; + license = with licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with maintainers; [ mkg20001 ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix index 5f4bc89db397..813397ba01f9 100644 --- a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix @@ -12,10 +12,12 @@ let '' #!${runtimeShell} cd $out/lib/hol_light + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}${camlp5}/lib/ocaml/${ocaml.version}/site-lib/" exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ - -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma + -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma \ -init make.ml ''; in @@ -25,13 +27,13 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2023-07-21"; + version = "unstable-2023-11-03"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; - hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; + rev = "dcd765c6032f52a0c0bf21fce5da4794a823e880"; + hash = "sha256-k2RBNDo4tc3eobKB84Y2xr0UQJvef0hv6jyFCaDCQFM="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index 950d2f8f401e..6ebd8f6f521d 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -7,6 +7,7 @@ , nix-update-script , autoPatchelfHook +, cmake , ncurses , pkg-config @@ -29,7 +30,7 @@ let rlinkLibs = if stdenv.isDarwin then [ darwin.libobjc - darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.AppKit ] else [ (lib.getLib gcc-unwrapped) fontconfig @@ -48,20 +49,21 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.19"; + version = "0.0.27"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-N7eHIyp2imkMUVwiOCameOROoaDJ7g+zNKdIB2aGZy0="; + hash = "sha256-q3Wq7jIYE4g1uPAlpzNWvwUvMy9eN6NQNmPNC4cFmYg="; }; - cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; + cargoHash = "sha256-SP85se+H4jL/cXyvfbFS2lxpNSjuptAIPs3/htcrMcw="; nativeBuildInputs = [ ncurses ] ++ lib.optionals stdenv.isLinux [ + cmake pkg-config autoPatchelfHook ]; @@ -84,8 +86,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 644 misc/rio.desktop -t $out/share/applications - install -D -m 644 rio/src/screen/window/resources/images/logo.png \ - $out/share/icons/hicolor/scalable/apps/rio.png + install -D -m 644 misc/logo.svg \ + $out/share/icons/hicolor/scalable/apps/rio.svg install -dm 755 "$terminfo/share/terminfo/r/" tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo diff --git a/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 4731355ac0f3..15d6bc84caa5 100644 --- a/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-gdgj/29dF1s4TfqE7roNBS2nOjfNZs1yt4bnFnEhDWs="; + hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM="; }; # required for build time tool `./tools/translate.c` @@ -66,5 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; maintainers = with maintainers; [ maggesi viric ]; platforms = platforms.all; + mainProgram = "fossil"; }; }) diff --git a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index 36cda3dfc722..bcaf37cdcb34 100644 --- a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.174"; + version = "5.12.175"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-juCiPulDVDDg9+DXUf9Gp/1lMoQ0NKLUTrzOqlv+32w="; + hash = "sha256-c026r3F/oNk/DyEwHb/1kSL99bqmYp7mqOdsWbB7Njo="; }; - cargoHash = "sha256-Wtw7GBPUci4fbplQDtz1Yxrf+7+3ABIe7GPN/gUER6I="; + cargoHash = "sha256-QpmgGonDy3Pkx2i5X3ZxmBXqupOoESoFMIBorFeqam4="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix index e56e57201e57..7ceb970737c3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; + sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; }; - cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; + cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/glab/default.nix b/nixpkgs/pkgs/applications/version-management/glab/default.nix index 723f4c59e3fc..f4e1815e278e 100644 --- a/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U="; + hash = "sha256-4kd3+IdVZbWVGbY3B8V1F07k67BvKOCfom4ZukNxrRo="; }; - vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM="; + vendorHash = "sha256-x96ChhozvTrX0eBWt3peX8dpd4gyukJ28RkqcD2W/OM="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/video/glaxnimate/default.nix b/nixpkgs/pkgs/applications/video/glaxnimate/default.nix index 0878c2f1ed59..4ab5222c54ba 100644 --- a/nixpkgs/pkgs/applications/video/glaxnimate/default.nix +++ b/nixpkgs/pkgs/applications/video/glaxnimate/default.nix @@ -37,19 +37,20 @@ let in stdenv.mkDerivation rec { pname = "glaxnimate"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitLab { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake wrapQtAppsHook + qttools ]; buildInputs = [ @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { python3WithLibs ]; + # Translation needs to be separately compiled + # https://gitlab.com/mattbas/glaxnimate/-/issues/648 + buildFlags = [ "translations" ]; + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { diff --git a/nixpkgs/pkgs/applications/video/subtitleedit/default.nix b/nixpkgs/pkgs/applications/video/subtitleedit/default.nix index 7ab14d8c1e67..88018e5a5612 100644 --- a/nixpkgs/pkgs/applications/video/subtitleedit/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleedit/default.nix @@ -1,26 +1,28 @@ { lib , stdenv -, copyDesktopItems +, fetchzip , makeDesktopItem +, nix-update-script + +, copyDesktopItems +, icoutils , makeWrapper -, fetchzip + , ffmpeg , gtk2 , hunspell -, icoutils , mono , mpv , tesseract4 -, nix-update-script }: stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.1"; + version = "4.0.2"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-Z7NVn4F19Hx55YWPNmbpWZ8yQulXd50bcy2A/8pCqJ4="; + hash = "sha256-kcs2h6HeWniJhGDNsy+EBauXbiDIlLCOJkVOCIzLBzM="; stripRoot = false; }; @@ -80,16 +82,16 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A subtitle editor"; - homepage = "https://nikse.dk/subtitleedit"; - license = licenses.gpl3Plus; longDescription = '' With Subtitle Edit you can easily adjust a subtitle if it is out of sync with the video in several different ways. You can also use it for making new subtitles from scratch (using the time-line /waveform/spectrogram) or for translating subtitles. ''; - maintainers = with maintainers; [ paveloom ]; + homepage = "https://nikse.dk/subtitleedit"; + license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ paveloom ]; }; } diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 70fd3635b745..7218d67062e7 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -914,17 +914,30 @@ rec { (cd old_out; eval "$extraCommands" ) mkdir $out - ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' - source $stdenv/setup - ${optionalString (!enableFakechroot) ''cd old_out''} - eval "$fakeRootCommands" - tar \ - --sort name \ - --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ - --hard-dereference \ - -cf $out/layer.tar . - ' - + ${if enableFakechroot then '' + proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + source $stdenv/setup + eval "$fakeRootCommands" + tar \ + --sort name \ + --exclude=./proc \ + --exclude=./sys \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + '' else '' + fakeroot bash -c ' + source $stdenv/setup + cd old_out + eval "$fakeRootCommands" + tar \ + --sort name \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + ''} sha256sum $out/layer.tar \ | cut -f 1 -d ' ' \ > $out/checksum diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index a6f2528a82ba..d837d0012590 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -7,6 +7,7 @@ , completeBuildDeps , completeDeps , crateAuthors +, crateLinks , crateDescription , crateHomepage , crateFeatures @@ -134,6 +135,7 @@ in '' export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name} export CARGO_MANIFEST_DIR=$(pwd) + export CARGO_MANIFEST_LINKS=${crateLinks} export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" export TARGET="${stdenv.hostPlatform.rust.rustcTargetSpec}" diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index d569142af66a..1760ab6e99a6 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -235,6 +235,7 @@ crate_: lib.makeOverridable "edition" "buildTests" "codegenUnits" + "links" ]; extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; nativeBuildInputs_ = nativeBuildInputs; @@ -317,6 +318,7 @@ crate_: lib.makeOverridable crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ]; crateHomepage = crate.homepage or ""; + crateLinks = crate.links or ""; crateType = if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else @@ -337,7 +339,7 @@ crate_: lib.makeOverridable configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription - crateFeatures crateRenames libName build workspace_member release libPath crateVersion + crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks extraLinkFlags extraRustcOptsForBuildRs crateAuthors crateHomepage verbose colors codegenUnits; }; diff --git a/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix new file mode 100644 index 000000000000..64dc160ff1fb --- /dev/null +++ b/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "adafruit-nrfutil"; + version = "0.5.3.post17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_nRF52_nrfutil"; + rev = "refs/tags/${version}"; + hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ + click + ecdsa + pyserial + ]; + + nativeCheckInputs = with python3Packages; [ + behave + nose + ]; + + preCheck = '' + mkdir test-reports + ''; + + pythonImportsCheck = [ + "nordicsemi" + ]; + + meta = with lib; { + homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; + description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; + license = licenses.bsd3; + maintainers = with maintainers; [ stargate01 ]; + }; +} diff --git a/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix index a6a8a690d538..5ad319042bf7 100644 --- a/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -11,6 +11,7 @@ , dmidecode , bashInteractive , nix-update-script +, nixosTests , testers , amazon-ssm-agent , overrideEtc ? true @@ -147,11 +148,14 @@ buildGoModule rec { ''; passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = amazon-ssm-agent; - command = "amazon-ssm-agent --version"; + tests = { + inherit (nixosTests) amazon-ssm-agent; + version = testers.testVersion { + package = amazon-ssm-agent; + command = "amazon-ssm-agent --version"; + }; }; + updateScript = nix-update-script { }; }; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/by-name/ch/changelog-d/package.nix b/nixpkgs/pkgs/by-name/ch/changelog-d/package.nix new file mode 100644 index 000000000000..10d4ad1ae355 --- /dev/null +++ b/nixpkgs/pkgs/by-name/ch/changelog-d/package.nix @@ -0,0 +1,38 @@ +{ + callPackage, + lib, + haskell, + haskellPackages, +}: + +let + hsPkg = haskellPackages.changelog-d; + + addCompletions = haskellPackages.generateOptparseApplicativeCompletions ["changelog-d"]; + + haskellModifications = + lib.flip lib.pipe [ + addCompletions + haskell.lib.justStaticExecutables + ]; + + mkDerivationOverrides = finalAttrs: oldAttrs: { + + version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; + + # nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d + passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { }); + + # nix-build -A changelog-d.tests + passthru.tests = { + basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; }; + }; + + meta = oldAttrs.meta // { + homepage = "https://codeberg.org/fgaz/changelog-d"; + maintainers = [ lib.maintainers.roberth ]; + }; + + }; +in + (haskellModifications hsPkg).overrideAttrs mkDerivationOverrides diff --git a/nixpkgs/pkgs/by-name/ch/changelog-d/tests/basic.nix b/nixpkgs/pkgs/by-name/ch/changelog-d/tests/basic.nix new file mode 100644 index 000000000000..25d434f0729f --- /dev/null +++ b/nixpkgs/pkgs/by-name/ch/changelog-d/tests/basic.nix @@ -0,0 +1,25 @@ +{ runCommand, changelog-d }: + +runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ changelog-d ]; +} '' + mkdir changelogs + cat > changelogs/config <<EOF + organization: NixOS + repository: boondoggle + EOF + cat > changelogs/a <<EOF + synopsis: Support numbers with incrementing base-10 digits + issues: #1234 + description: { + This didn't work before. + } + EOF + changelog-d changelogs >$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x +'' diff --git a/nixpkgs/pkgs/by-name/ch/changelog-d/updateScript.nix b/nixpkgs/pkgs/by-name/ch/changelog-d/updateScript.nix new file mode 100644 index 000000000000..fae22a161b6d --- /dev/null +++ b/nixpkgs/pkgs/by-name/ch/changelog-d/updateScript.nix @@ -0,0 +1,12 @@ +{ writeShellApplication, cabal2nix }: + +writeShellApplication { + name = "update-changelog-d"; + runtimeInputs = [ + cabal2nix + ]; + text = '' + cd pkgs/development/misc/haskell/changelog-d + cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix + ''; +} diff --git a/nixpkgs/pkgs/by-name/cl/cljfmt/package.nix b/nixpkgs/pkgs/by-name/cl/cljfmt/package.nix new file mode 100644 index 000000000000..1c6f30cc9d76 --- /dev/null +++ b/nixpkgs/pkgs/by-name/cl/cljfmt/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildGraalvmNativeImage +, fetchurl +, nix-update-script +, testers +, cljfmt +}: + +buildGraalvmNativeImage rec { + pname = "cljfmt"; + version = "0.11.2"; + + src = fetchurl { + url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-vEldQ7qV375mHMn3OUdn0FaPd+f/v9g+C+PuzbSTWtk="; + }; + + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "-H:Log=registerResource:" + "--initialize-at-build-time" + "--diagnostics-mode" + "--report-unsupported-elements-at-runtime" + "--no-fallback" + ]; + + passthru.updateScript = nix-update-script { }; + + passthru.tests.version = testers.testVersion { + inherit version; + package = cljfmt; + command = "cljfmt --version"; + }; + + meta = with lib; { + mainProgram = "cljfmt"; + description = "A tool for formatting Clojure code"; + homepage = "https://github.com/weavejester/cljfmt"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.epl10; + changelog = "https://github.com/weavejester/cljfmt/blob/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ sg-qwt ]; + }; +} diff --git a/nixpkgs/pkgs/by-name/ja/jasper/package.nix b/nixpkgs/pkgs/by-name/ja/jasper/package.nix index fbd8b9f1657d..bb059cde347f 100644 --- a/nixpkgs/pkgs/by-name/ja/jasper/package.nix +++ b/nixpkgs/pkgs/by-name/ja/jasper/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ="; + hash = "sha256-u5380inzLmOT0v6emOtjU3pIEQqTmziAVz1R6QG77x0="; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix index 400e8f0250c0..7328416b93dc 100644 --- a/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix +++ b/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,6 +2,7 @@ , cmake , darwin , fetchFromGitHub +, fetchpatch , nix-update-script , stdenv , symlinkJoin @@ -37,15 +38,26 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1483"; + version = "1538"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; + hash = "sha256-3JPGKJbO7Z3Jxz9KNSLYBAM7zQ+RJwBqsfRtpK6JS48="; }; + patches = [ + # openblas > v0.3.21 64-bit pkg-config file is now named openblas64.pc + # can remove when patch is accepted upstream + # https://github.com/ggerganov/llama.cpp/pull/4134 + (fetchpatch { + name = "openblas64-pkg-config.patch"; + url = "https://github.com/ggerganov/llama.cpp/commit/c885cc9f76c00557601b877136191b0f7aadc320.patch"; + hash = "sha256-GBTxCiNrCazYRvcHwbqVMAALuJ+Svzf5BE7+nkxw064="; + }) + ]; + postPatch = '' substituteInPlace ./ggml-metal.m \ --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" diff --git a/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix b/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix index e0dd291ef76b..c6c41c13c6ea 100644 --- a/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix +++ b/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.302"; + version = "0.0.307"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-I4ZkPdxidT2670NU5o1QTaee4fuDJNEirg7peuHqaJQ="; + hash = "sha256-HcjHqZwT+PTK0ICCvdhaoczNG/DHpJQy1dvGieA2mNc="; }; - vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; + vendorHash = "sha256-0HyKcn5xt9vezSn6crRsJ/Jshmnk4OM8HZqH/v7DUDM="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix b/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix index 0240966e2d86..7e5782cba0f1 100644 --- a/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -15,6 +15,7 @@ , pciutils , usbutils , util-linux +, nixosTests , testers , ocsinventory-agent , nix-update-script @@ -75,11 +76,14 @@ perlPackages.buildPerlPackage rec { ''; passthru = { - tests.version = testers.testVersion { - package = ocsinventory-agent; - command = "ocsinventory-agent --version"; - # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm - version = "2.10.0"; + tests = { + inherit (nixosTests) ocsinventory-agent; + version = testers.testVersion { + package = ocsinventory-agent; + command = "ocsinventory-agent --version"; + # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm + version = "2.10.0"; + }; }; updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/by-name/op/open-fprintd/package.nix b/nixpkgs/pkgs/by-name/op/open-fprintd/package.nix new file mode 100644 index 000000000000..b8c8b765d550 --- /dev/null +++ b/nixpkgs/pkgs/by-name/op/open-fprintd/package.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "open-fprintd"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "uunicorn"; + repo = pname; + rev = version; + sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; + }; + + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; + + checkInputs = with python3Packages; [ dbus-python ]; + + postInstall = '' + install -D -m 644 debian/open-fprintd.service \ + $out/lib/systemd/system/open-fprintd.service + install -D -m 644 debian/open-fprintd-resume.service \ + $out/lib/systemd/system/open-fprintd-resume.service + install -D -m 644 debian/open-fprintd-suspend.service \ + $out/lib/systemd/system/open-fprintd-suspend.service + substituteInPlace $out/lib/systemd/system/open-fprintd.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-resume.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-suspend.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" + ''; + + meta = with lib; { + description = + "Fprintd replacement which allows you to have your own backend as a standalone service"; + homepage = "https://github.com/uunicorn/open-fprintd"; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/by-name/po/poethepoet/package.nix b/nixpkgs/pkgs/by-name/po/poethepoet/package.nix index cdaccc6b436a..4faecc29cff1 100644 --- a/nixpkgs/pkgs/by-name/po/poethepoet/package.nix +++ b/nixpkgs/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.24.2"; + version = "0.24.4"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "v${version}"; - hash = "sha256-tumEwaHXFLSXOmyQba4wBU5irvzZBL3BsCtF+Nlly+c="; + hash = "sha256-RTV3TVNciJE7dC/gtViZcSWFXR2A4qNMAJ/1OEzMAus="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/by-name/te/termshot/package.nix b/nixpkgs/pkgs/by-name/te/termshot/package.nix new file mode 100644 index 000000000000..b44f6ec906f3 --- /dev/null +++ b/nixpkgs/pkgs/by-name/te/termshot/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule rec { + pname = "termshot"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "homeport"; + repo = "termshot"; + rev = "v${version}"; + hash = "sha256-Sxp6abYq0MrqtqDdpffSBdZB3/EyIMF9Ixsc7IgW5hI="; + }; + + vendorHash = "sha256-jzDbA1iN+1dbTVgKw228TuCV3eeAVmHFDiHd2qF/80E="; + + ldflags = [ + "-s" + "-w" + "-X github.com/homeport/termshot/internal/cmd.version=${version}" + ]; + + meta = { + description = "Creates screenshots based on terminal command output"; + homepage = "https://github.com/homeport/termshot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [defelo]; + mainProgram = "termshot"; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/typst-preview/Cargo.lock b/nixpkgs/pkgs/by-name/ty/typst-preview/Cargo.lock index 3d988b591865..81618b1902ea 100644 --- a/nixpkgs/pkgs/tools/typesetting/typst-preview/Cargo.lock +++ b/nixpkgs/pkgs/by-name/ty/typst-preview/Cargo.lock @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.9.0" +version = "0.9.1" dependencies = [ "anyhow", "chrono", diff --git a/nixpkgs/pkgs/tools/typesetting/typst-preview/package.json b/nixpkgs/pkgs/by-name/ty/typst-preview/package.json index f68c8a6b1a23..f68c8a6b1a23 100644 --- a/nixpkgs/pkgs/tools/typesetting/typst-preview/package.json +++ b/nixpkgs/pkgs/by-name/ty/typst-preview/package.json diff --git a/nixpkgs/pkgs/by-name/ty/typst-preview/package.nix b/nixpkgs/pkgs/by-name/ty/typst-preview/package.nix new file mode 100644 index 000000000000..880e7288ca97 --- /dev/null +++ b/nixpkgs/pkgs/by-name/ty/typst-preview/package.nix @@ -0,0 +1,94 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, mkYarnPackage +, fetchYarnDeps +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: + +let + # Keep the vscode "mgt19937.typst-preview" extension in sync when updating + # this package at pkgs/applications/editors/vscode/extensions/default.nix + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "Enter-tainer"; + repo = "typst-preview"; + rev = "v${version}"; + hash = "sha256-VmUcnmTe5Ngcje0SSpOY13HUIfdxBMg8KwvZ1wupCqc="; + }; + + frontendSrc = "${src}/addons/frontend"; + + frontend = mkYarnPackage { + inherit version; + pname = "typst-preview-frontend"; + src = frontendSrc; + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${frontendSrc}/yarn.lock"; + hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R deps/typst-preview-frontend/dist $out + runHook postInstall + ''; + + doDist = false; + }; +in +rustPlatform.buildRustPackage { + pname = "typst-preview"; + inherit version src; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4="; + "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk="; + "typst-ts-compiler-0.4.0-rc9" = "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + prePatch = '' + mkdir -p addons/vscode/out/frontend + cp -R ${frontend}/* addons/vscode/out/frontend/ + ''; + + meta = { + description = "Typst preview extension for VSCode"; + homepage = "https://github.com/Enter-tainer/typst-preview/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; + mainProgram = "typst-preview"; + }; +} diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index cbfd42dfc874..15eac7a7168a 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "49d09494dd24eae895fe1260e2c26157f740e451", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", - "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", - "msg": "Update from Hackage at 2023-10-21T19:49:07Z" + "commit": "f4111a737432472002a38495b14b930255705d6a", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f4111a737432472002a38495b14b930255705d6a.tar.gz", + "sha256": "0q1nhk821fdwxmidsd9mnd77ml4c05f7rnmd80g4s876s65ldi5q", + "msg": "Update from Hackage at 2023-11-10T11:27:19Z" } diff --git a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 40cce28dc5d2..bc4aaf72ae9e 100644 --- a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20231031055637"; + version = "20231118232758"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k="; + hash = "sha256-m4B1O8h6lRxArEyuE4XUF9eJtoBhl59QNXkVjWKx2ko="; }; vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { diff --git a/nixpkgs/pkgs/development/compilers/circt/default.nix b/nixpkgs/pkgs/development/compilers/circt/default.nix index 129388005b5a..4c4f69bc74ff 100644 --- a/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.58.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; + sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix index 6be098972ee4..92ed154a02ba 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix index 3ed263a43325..97539cd54321 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix index 6246630f5495..a54894bda952 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix index 124303c0c81a..5079578239ea 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix index a627f74179bb..3db132036652 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix index a0451f57c6ec..499f463e801a 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix index 7b921ecc441f..3d7852ec701e 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix index 2bddbea7bc7d..7dc90444d008 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix index e7465a950042..7a06d124dfdb 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix index 9442f2bf19b4..522eab95794f 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix @@ -205,6 +205,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix index b64b3ba5ec6c..affebd95763e 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix @@ -197,6 +197,8 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch # Work around a type not being defined when including Rts.h in bytestring's cbits diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix index 7ee135a13b44..705b85fb1159 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix @@ -197,6 +197,8 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.4.8.nix b/nixpkgs/pkgs/development/compilers/ghc/9.4.8.nix new file mode 100644 index 000000000000..e915c549dc62 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/9.4.8.nix @@ -0,0 +1,391 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || stdenv.targetPlatform.isAarch64) +, # LLVM is conceptually a run-time-only dependency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, enableProfiledLibs ? true + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.8"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0bf407eb67fe3e3c24b0f4c8dea8cb63e07f63ca0f76cf2058565143507ab85e"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index 5687555d5d95..83b986be2b32 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -267,6 +267,7 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; patches = [ + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 (if lib.versionAtLeast version "9.8" then ./docs-sphinx-7-ghc98.patch else ./docs-sphinx-7.patch ) diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index bc2dfbda09f3..0f49384d6e7c 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.32.2"; + version = "0.32.4"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1FIeH4NFyYQinqzCBZ9m2Jm6f5tLJDJxVdb4D3+fQ4w="; + hash = "sha256-xl75692d8h1uvh32pf+VJcXwQJwocxDaBNbfolHJKXU="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI="; + cargoHash = "sha256-SwG7cfoDYGyBu+1qF3+ynnw9rOA6jNExRV9uOVwgO60="; passthru.updateScript = nix-update-script { }; diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index 3f7c286d5903..d8b8c141042b 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA="; + sha256 = "sha256-NiBwQ7BzNgRdWLvjOi1fQni+vnYwn0nLHxqAVucmb2k="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/nixpkgs/pkgs/development/compilers/squeak/default.nix b/nixpkgs/pkgs/development/compilers/squeak/default.nix index 79627eba7c83..0494539c4435 100644 --- a/nixpkgs/pkgs/development/compilers/squeak/default.nix +++ b/nixpkgs/pkgs/development/compilers/squeak/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip -, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, fetchzip +, autoconf +, automake +, autoreconfHook +, dos2unix +, file +, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libGL, libpulseaudio -, libtool, libuuid, openssl, pango, xorg -, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null -, squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null +, alsa-lib +, coreutils +, freetype +, glib +, glibc +, gnugrep +, libGL +, libpulseaudio +, libtool +, libuuid +, openssl +, pango +, xorg +, squeakImageHash ? null +, squeakSourcesHash ? null +, squeakSourcesVersion ? null +, squeakVersion ? null +, squeakVmCommitHash ? null +, squeakVmCommitHashHash ? null , squeakVmVersion ? null } @ args: let - inherit (builtins) elemAt; + inherit (builtins) elemAt toString; + nullableOr = o: default: if o == null then default else o; bits = stdenv.hostPlatform.parsed.cpu.bits; @@ -75,7 +100,6 @@ in stdenv.mkDerivation { autoconf automake autoreconfHook - clang dos2unix file perl @@ -140,7 +164,16 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ( + [ "-fcommon" ] + ++ (lib.optionals stdenv.cc.isClang [ + # LLVM 16 turned these into errors (rightly, perhaps.) + # Allow this package to continue to build despite this change. + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-function-pointer-types" + ]) + ); preAutoreconf = '' pushd ./platforms/unix/config > /dev/null diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 723b8e5efba3..7fe56b3f13d0 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -20,7 +20,7 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ + Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({ Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible @@ -35,11 +35,11 @@ self: super: { cabalInstallOverlay = cself: csuper: { # Needs to be upgraded compared to Stackage LTS 21 - cabal-install-solver = cself.cabal-install-solver_3_10_1_0; + cabal-install-solver = cself.cabal-install-solver_3_10_2_1; # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_2_0; + Cabal = cself.Cabal_3_10_2_1; Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version @@ -57,15 +57,15 @@ self: super: { # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_6; - hspec-discover = cself.hspec-discover_2_11_6; - hspec = cself.hspec_2_11_6; + hspec-core = cself.hspec-core_2_11_7; + hspec-discover = cself.hspec-discover_2_11_7; + hspec = cself.hspec_2_11_7; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_11* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; + hspec-discover_2_11_7 = dontCheck csuper.hspec-discover_2_11_7; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -194,7 +194,7 @@ self: super: { # 2023-08-09: Jailbreak because of vector < 0.13 # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_6; + hspec = self.hspec_2_11_7; })); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 @@ -295,7 +295,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; + patat = super.patat.override { pandoc = self.pandoc_3_1_9; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -498,7 +498,7 @@ self: super: { structures = dontCheck super.structures; # Requires alex >= 3.4 - jacinda = super.jacinda.override { alex = self.alex_3_4_0_0; }; + jacinda = super.jacinda.override { alex = self.alex_3_4_0_1; }; # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw @@ -1046,13 +1046,19 @@ self: super: { # test suite requires git and does a bunch of git operations restless-git = dontCheck super.restless-git; - # requires git at test-time *and* runtime, but we'll just rely on users to - # bring their own git at runtime. Additionally, sensei passes `-package - # hspec-meta` to GHC in the tests, but doesn't depend on it itself. - sensei = overrideCabal (drv: { + # patch out a flaky test that depends on output from hspec >= v2.11.7. + # https://github.com/hspec/sensei/issues/125 + sensei = appendPatch (fetchpatch { + url = "https://github.com/hspec/sensei/commit/5c11026fa48e13ea1c351ab882765eb0966f2e97.patch"; + hash = "sha256-eUCDvypj2bxTRnHLzrcembLMKHg5c3W3quNfclBDsso="; + }) (overrideCabal (drv: { + # sensei passes `-package hspec-meta` to GHC in the tests, but doesn't + # depend on it itself. testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta ]; + # requires git at test-time *and* runtime, but we'll just rely on users to + # bring their own git at runtime. testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; - }) super.sensei; + }) super.sensei); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; @@ -1176,7 +1182,7 @@ self: super: { # stack-2.13.1 requires a bunch of the latest packages. (drv: drv.overrideScope (hfinal: hprev: { ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 - crypton = hprev.crypton_0_33; # needs crypton >= 0.33 + crypton = hprev.crypton_0_34; # needs crypton >= 0.33 hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 @@ -1671,19 +1677,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override { - hspec-discover = self.hspec-discover_2_11_6; - hspec-core = self.hspec-core_2_11_6; + hspec_2_11_7 = doDistribute (super.hspec_2_11_7.override { + hspec-discover = self.hspec-discover_2_11_7; + hspec-core = self.hspec-core_2_11_7; }); - hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { + hspec-meta_2_11_7 = doDistribute (super.hspec-meta_2_11_7.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { - hspec-meta = self.hspec-meta_2_11_6; + hspec-discover_2_11_7 = doDistribute (super.hspec-discover_2_11_7.override { + hspec-meta = self.hspec-meta_2_11_7; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_7 # is overlayed to hspec-core. - hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override { + hspec-core_2_11_7 = doDistribute (dontCheck (super.hspec-core_2_11_7.override { hspec-expectations = self.hspec-expectations_0_8_4; })); @@ -1841,7 +1847,7 @@ self: super: { inherit (let pandoc-cli-overlay = self: super: { # pandoc-cli requires pandoc >= 3.1 - pandoc = self.pandoc_3_1_8; + pandoc = self.pandoc_3_1_9; # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. @@ -1853,11 +1859,11 @@ self: super: { }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; - pandoc_3_1_8 = doDistribute (super.pandoc_3_1_8.overrideScope pandoc-cli-overlay); + pandoc_3_1_9 = doDistribute (super.pandoc_3_1_9.overrideScope pandoc-cli-overlay); pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay; }) pandoc-cli - pandoc_3_1_8 + pandoc_3_1_9 pandoc-lua-engine ; @@ -2685,4 +2691,26 @@ self: super: { sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + # Needs git for compile-time insertion of commit hash into --version string. + kmonad = overrideCabal (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; + }) super.kmonad; + + # Both of these need specific versions of ghc-lib-parser, the minor releases + # seem to be tied. + ghc-syntax-highlighter_0_0_10_0 = super.ghc-syntax-highlighter_0_0_10_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231014; + }); + ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231009; + }); + + # Needs a matching version of ipython-kernel and a + # ghc-syntax-highlighter compatible with a newer ghc-lib-parser it + # transitively pulls in + ihaskell = super.ihaskell.overrideScope (self: super: { + ipython-kernel = self.ipython-kernel_0_11_0_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5964e0d78972..c541c852df36 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -125,6 +125,9 @@ self: super: { algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; }); + # Overly-strict bounds introducted by a revision in version 0.3.2. + text-metrics = doJailbreak super.text-metrics; + # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 OneTuple = addBuildDepends [ self.foldable1-classes-compat diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 207697356f97..acde3041b1fa 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -148,6 +148,9 @@ self: super: { # has a restrictive lower bound on Cabal fourmolu = doJailbreak super.fourmolu; + # Overly-strict bounds introducted by a revision in version 0.3.2. + text-metrics = doJailbreak super.text-metrics; + # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 OneTuple = addBuildDepends [ self.foldable1-classes-compat diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 453526274094..de1412f4c0ee 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -171,4 +171,6 @@ self: super: { # Requires GHC < 9.4 ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); + + hspec-megaparsec = super.hspec-megaparsec_2_2_0; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 91213b0274d3..803e34163f9d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -67,14 +67,14 @@ self: super: { doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 - some = doDistribute self.some_1_0_5; + some = doDistribute self.some_1_0_6; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; - th-desugar = doDistribute self.th-desugar_1_15; + th-desugar = doDistribute self.th-desugar_1_16; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; base-compat = doDistribute self.base-compat_0_13_1; base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; - fgl = doDistribute self.fgl_5_8_1_1; + fgl = doDistribute self.fgl_5_8_2_0; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f5d72a0c50b..839b3c1bee5b 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -363,6 +363,7 @@ broken-packages: - bech32 # failure in job https://hydra.nixos.org/build/233194823 at 2023-09-02 - bed-and-breakfast # failure in job https://hydra.nixos.org/build/233221152 at 2023-09-02 - Befunge93 # failure in job https://hydra.nixos.org/build/233226751 at 2023-09-02 + - benc # failure in job https://hydra.nixos.org/build/241434046 at 2023-11-19 - bench-graph # failure in job https://hydra.nixos.org/build/233239830 at 2023-09-02 - BenchmarkHistory # failure in job https://hydra.nixos.org/build/233213179 at 2023-09-02 - bench-show # failure in job https://hydra.nixos.org/build/233245858 at 2023-09-02 @@ -955,6 +956,7 @@ broken-packages: - courier # failure in job https://hydra.nixos.org/build/233215760 at 2023-09-02 - court # failure in job https://hydra.nixos.org/build/233192047 at 2023-09-02 - coverage # failure in job https://hydra.nixos.org/build/233199365 at 2023-09-02 + - cozo-hs # failure in job https://hydra.nixos.org/build/241432654 at 2023-11-19 - cparsing # failure in job https://hydra.nixos.org/build/233192377 at 2023-09-02 - cpio-conduit # failure in job https://hydra.nixos.org/build/233220518 at 2023-09-02 - cplusplus-th # failure in job https://hydra.nixos.org/build/233204461 at 2023-09-02 @@ -1355,6 +1357,7 @@ broken-packages: - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21 - eccrypto-ed25519-bindings # failure in job https://hydra.nixos.org/build/233217399 at 2023-09-02 - ecma262 # failure in job https://hydra.nixos.org/build/233260026 at 2023-09-02 + - ecta # failure in job https://hydra.nixos.org/build/241421274 at 2023-11-19 - ecta-plugin # failure in job https://hydra.nixos.org/build/233224764 at 2023-09-02 - ecu # failure in job https://hydra.nixos.org/build/233230797 at 2023-09-02 - eddie # failure in job https://hydra.nixos.org/build/233254499 at 2023-09-02 @@ -1676,6 +1679,8 @@ broken-packages: - fractals # failure in job https://hydra.nixos.org/build/233205969 at 2023-09-02 - fraction # failure in job https://hydra.nixos.org/build/233204186 at 2023-09-02 - frag # failure in job https://hydra.nixos.org/build/234458411 at 2023-09-13 + - Frames-beam # failure in job https://hydra.nixos.org/build/241429730 at 2023-11-19 + - Frames-streamly # failure in job https://hydra.nixos.org/build/241420906 at 2023-11-19 - franchise # failure in job https://hydra.nixos.org/build/233256790 at 2023-09-02 - fraxl # failure in job https://hydra.nixos.org/build/233219345 at 2023-09-02 - freddy # failure in job https://hydra.nixos.org/build/233208999 at 2023-09-02 @@ -1934,6 +1939,7 @@ broken-packages: - googlepolyline # failure in job https://hydra.nixos.org/build/233209674 at 2023-09-02 - google-search # failure in job https://hydra.nixos.org/build/233214524 at 2023-09-02 - google-server-api # failure in job https://hydra.nixos.org/build/233218521 at 2023-09-02 + - google-static-maps # failure in job https://hydra.nixos.org/build/241418035 at 2023-11-19 - google-translate # failure in job https://hydra.nixos.org/build/233234076 at 2023-09-02 - gopherbot # failure in job https://hydra.nixos.org/build/233207680 at 2023-09-02 - gopro-plus # failure in job https://hydra.nixos.org/build/233225073 at 2023-09-02 @@ -2178,6 +2184,7 @@ broken-packages: - haskell-rules # failure in job https://hydra.nixos.org/build/233225854 at 2023-09-02 - haskellscrabble # failure in job https://hydra.nixos.org/build/233251248 at 2023-09-02 - haskellscript # failure in job https://hydra.nixos.org/build/233193435 at 2023-09-02 + - haskell-snake # failure in job https://hydra.nixos.org/build/241433525 at 2023-11-19 - haskell-spacegoo # failure in job https://hydra.nixos.org/build/233206108 at 2023-09-02 - haskell-src-exts-prisms # failure in job https://hydra.nixos.org/build/233197742 at 2023-09-02 - haskell-src-exts-qq # failure in job https://hydra.nixos.org/build/233234764 at 2023-09-02 @@ -2791,12 +2798,11 @@ broken-packages: - ignore # failure in job https://hydra.nixos.org/build/233238874 at 2023-09-02 - igraph # failure in job https://hydra.nixos.org/build/233192875 at 2023-09-02 - ihaskell-charts # failure in job https://hydra.nixos.org/build/233193328 at 2023-09-02 - - ihaskell-diagrams # failure in job https://hydra.nixos.org/build/233230959 at 2023-09-02 - ihaskell-gnuplot # failure in job https://hydra.nixos.org/build/233223675 at 2023-09-02 - ihaskell-graphviz # failure in job https://hydra.nixos.org/build/233200671 at 2023-09-02 + - ihaskell-hvega # failure in job https://hydra.nixos.org/build/241514418 at 2023-11-20 - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 - - ihaskell-widgets # failure in job https://hydra.nixos.org/build/233198849 at 2023-09-02 - ihp-hsx # failure in job https://hydra.nixos.org/build/233211401 at 2023-09-02 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 @@ -2981,6 +2987,7 @@ broken-packages: - json-qq # failure in job https://hydra.nixos.org/build/233196259 at 2023-09-02 - jsonresume # failure in job https://hydra.nixos.org/build/233202350 at 2023-09-02 - jsonrpc-conduit # failure in job https://hydra.nixos.org/build/233195089 at 2023-09-02 + - json-rpc # failure in job https://hydra.nixos.org/build/241430941 at 2023-11-19 - json-rpc-generic # failure in job https://hydra.nixos.org/build/233201371 at 2023-09-02 - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02 - jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02 @@ -3049,7 +3056,6 @@ broken-packages: - kind-integer # failure in job https://hydra.nixos.org/build/233250066 at 2023-09-02 - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - - kmonad # failure in job https://hydra.nixos.org/build/233239997 at 2023-09-02 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 @@ -3096,6 +3102,7 @@ broken-packages: - lambdatwit # failure in job https://hydra.nixos.org/build/233219603 at 2023-09-02 - Lambdaya # failure in job https://hydra.nixos.org/build/233227702 at 2023-09-02 - lame # failure in job https://hydra.nixos.org/build/233250932 at 2023-09-02 + - laminar # failure in job https://hydra.nixos.org/build/241426331 at 2023-11-19 - language-asn # failure in job https://hydra.nixos.org/build/233227929 at 2023-09-02 - language-c-comments # failure in job https://hydra.nixos.org/build/233234112 at 2023-09-02 - language-c-inline # failure in job https://hydra.nixos.org/build/233245990 at 2023-09-02 @@ -3257,6 +3264,7 @@ broken-packages: - listlike-instances # failure in job https://hydra.nixos.org/build/233238303 at 2023-09-02 - list-mux # failure in job https://hydra.nixos.org/build/233206407 at 2023-09-02 - list-prompt # failure in job https://hydra.nixos.org/build/233235855 at 2023-09-02 + - list-shuffle # failure in job https://hydra.nixos.org/build/241416196 at 2023-11-19 - list-t-http-client # failure in job https://hydra.nixos.org/build/233239262 at 2023-09-02 - list-t-libcurl # failure in job https://hydra.nixos.org/build/233237389 at 2023-09-02 - list-tries # failure in job https://hydra.nixos.org/build/233250041 at 2023-09-02 @@ -3379,6 +3387,7 @@ broken-packages: - mapalgebra # failure in job https://hydra.nixos.org/build/233215542 at 2023-09-02 - map-exts # failure in job https://hydra.nixos.org/build/233247423 at 2023-09-02 - Mapping # failure in job https://hydra.nixos.org/build/233248158 at 2023-09-02 + - mappings # failure in job https://hydra.nixos.org/build/241435621 at 2023-11-19 - mappy # failure in job https://hydra.nixos.org/build/233250202 at 2023-09-02 - map-reduce-folds # failure in job https://hydra.nixos.org/build/233245163 at 2023-09-02 - MapWith # failure in job https://hydra.nixos.org/build/233237146 at 2023-09-02 @@ -3607,6 +3616,7 @@ broken-packages: - motor-reflection # failure in job https://hydra.nixos.org/build/233247530 at 2023-09-02 - mount # failure in job https://hydra.nixos.org/build/233220302 at 2023-09-02 - movie-monad # failure in job https://hydra.nixos.org/build/233215402 at 2023-09-02 + - mpd-current-json # failure in job https://hydra.nixos.org/build/241424468 at 2023-11-19 - mpppc # failure in job https://hydra.nixos.org/build/233223008 at 2023-09-02 - mpris # failure in job https://hydra.nixos.org/build/233259241 at 2023-09-02 - mpvguihs # failure in job https://hydra.nixos.org/build/233196650 at 2023-09-02 @@ -3930,6 +3940,7 @@ broken-packages: - orion-hs # failure in job https://hydra.nixos.org/build/233210586 at 2023-09-02 - orizentic # failure in job https://hydra.nixos.org/build/233197904 at 2023-09-02 - OrPatterns # failure in job https://hydra.nixos.org/build/233191538 at 2023-09-02 + - orville-postgresql # failure in job https://hydra.nixos.org/build/241433010 at 2023-11-19 - ory-hydra-client # failure in job https://hydra.nixos.org/build/233197456 at 2023-09-02 - ory-kratos # failure in job https://hydra.nixos.org/build/233191249 at 2023-09-02 - osc # failure in job https://hydra.nixos.org/build/233250062 at 2023-09-02 @@ -4192,6 +4203,7 @@ broken-packages: - platinum-parsing # failure in job https://hydra.nixos.org/build/233225071 at 2023-09-02 - PlayingCards # failure in job https://hydra.nixos.org/build/233239100 at 2023-09-02 - playlists # failure in job https://hydra.nixos.org/build/233240151 at 2023-09-02 + - plex # failure in job https://hydra.nixos.org/build/241435308 at 2023-11-19 - plist-buddy # failure in job https://hydra.nixos.org/build/233199181 at 2023-09-02 - plist # failure in job https://hydra.nixos.org/build/233233906 at 2023-09-02 - plivo # failure in job https://hydra.nixos.org/build/233256647 at 2023-09-02 @@ -4626,7 +4638,6 @@ broken-packages: - reify # failure in job https://hydra.nixos.org/build/233247509 at 2023-09-02 - relacion # failure in job https://hydra.nixos.org/build/233241624 at 2023-09-02 - relation # failure in job https://hydra.nixos.org/build/233244581 at 2023-09-02 - - releaser # failure in job https://hydra.nixos.org/build/233239420 at 2023-09-02 - relevant-time # failure in job https://hydra.nixos.org/build/233190794 at 2023-09-02 - reload # failure in job https://hydra.nixos.org/build/233212925 at 2023-09-02 - remark # failure in job https://hydra.nixos.org/build/233240981 at 2023-09-02 @@ -5892,6 +5903,7 @@ broken-packages: - vty-examples # failure in job https://hydra.nixos.org/build/233235872 at 2023-09-02 - vty-menu # failure in job https://hydra.nixos.org/build/233232391 at 2023-09-02 - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 + - vty-unix # failure in job https://hydra.nixos.org/build/241443107 at 2023-11-19 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - wai-git-http # failure in job https://hydra.nixos.org/build/233191513 at 2023-09-02 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e79dd7e72fe4..eb323003ef34 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -106,6 +106,7 @@ extra-packages: - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser-ex == 9.6.* # 2023-10-24: preserve for GHC 9.6 + - ghc-syntax-highlighter == 0.0.10.* # 2023-11-20: - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x @@ -117,6 +118,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - http2 < 3.3 # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5> @@ -130,7 +132,9 @@ extra-packages: - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 + - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 + - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 @@ -669,6 +673,7 @@ unsupported-platforms: netlink: [ platforms.darwin ] notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu oculus: [ platforms.darwin ] + ostree-pin: [ platforms.darwin ] # depends on gi-ostree pam: [ platforms.darwin ] parport: [ platforms.darwin ] persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 @@ -681,6 +686,7 @@ unsupported-platforms: reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] reflex-dom: [ platforms.darwin ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] + rsi-break: [ platforms.darwin ] # depends on monomer rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] SDL-mixer: [ platforms.darwin ] # depends on mesa @@ -777,6 +783,7 @@ supported-platforms: systemd-api: [ platforms.linux ] tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] + vty-windows: [ platforms.windows ] # depends on Win32 Win32-console: [ platforms.windows ] Win32-dhcp-server: [ platforms.windows ] Win32-errors: [ platforms.windows ] diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8be7c0fe44f3..c93590d0980c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.16 +# Stackage LTS 21.19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -134,7 +134,7 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.9 - - barbies ==2.0.4.0 + - barbies ==2.0.5.0 - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 - base32 ==0.3.1.0 @@ -161,7 +161,7 @@ default-package-overrides: - bech32 ==1.1.3 - bech32-th ==1.1.1 - bench ==1.0.12 - - benchpress ==0.2.2.22 + - benchpress ==0.2.2.23 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 - benri-hspec ==0.1.0.1 @@ -267,14 +267,14 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.10 + - bytestring-tree-builder ==0.2.7.11 - bytestring-trie ==0.2.7.2 - bz2 ==1.0.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.3 - c2hs ==0.28.8 - cabal2spec ==2.7.0 - - cabal-appimage ==0.4.0.1 + - cabal-appimage ==0.4.0.2 - cabal-clean ==0.2.20230609 - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 @@ -319,13 +319,13 @@ default-package-overrides: - character-cases ==0.1.0.6 - charset ==0.3.10 - charsetdetect-ae ==1.1.0.4 - - Chart ==1.9.4 - - Chart-diagrams ==1.9.4 + - Chart ==1.9.5 + - Chart-diagrams ==1.9.5.1 - ChasingBottoms ==1.3.1.12 - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0.0.1 - - chimera ==0.3.3.0 + - chimera ==0.3.4.0 - choice ==0.2.3 - chronologique ==0.3.1.3 - chronos ==1.1.5.1 @@ -356,7 +356,7 @@ default-package-overrides: - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - co-log-concurrent ==0.5.1.0 - - co-log-core ==0.3.2.0 + - co-log-core ==0.3.2.1 - colonnade ==1.2.0.2 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 @@ -371,15 +371,15 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.3 - - commonmark-extensions ==0.2.3.6 + - commonmark ==0.2.4 + - commonmark-extensions ==0.2.4 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.1 - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.3 - - compdata ==0.13.0 + - compdata ==0.13.1 - compensated ==0.8.3 - compiler-warnings ==0.1.0 - componentm ==0.0.0.2 @@ -422,7 +422,7 @@ default-package-overrides: - context-wai-middleware ==0.2.0.2 - contiguous ==0.6.3.0 - contravariant ==1.5.5 - - contravariant-extras ==0.3.5.3 + - contravariant-extras ==0.3.5.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 @@ -587,7 +587,7 @@ default-package-overrides: - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 - - di-monad ==1.3.2 + - di-monad ==1.3.5 - directory-tree ==0.12.1 - direct-sqlite ==2.3.28 - dirichlet ==0.1.0.7 @@ -614,7 +614,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1.1.1 - doctest-lib ==0.1 - - doctest-parallel ==0.3.0.1 + - doctest-parallel ==0.3.1 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.4 @@ -701,7 +701,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.10.3 + - esqueleto ==3.5.11.0 - event-list ==0.1.2.1 - eventstore ==1.4.2 - every ==0.0.1 @@ -778,7 +778,7 @@ default-package-overrides: - fixed-vector ==1.2.2.1 - fixed-vector-hetero ==0.6.1.1 - fix-whitespace ==0.0.11 - - flac ==0.2.0 + - flac ==0.2.1 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 - flat ==0.6 @@ -791,7 +791,7 @@ default-package-overrides: - fmlist ==0.9.4 - fmt ==0.6.3.0 - fn ==0.3.0.2 - - focus ==1.0.3.1 + - focus ==1.0.3.2 - focuslist ==0.1.1.0 - foldable1-classes-compat ==0.1 - fold-debounce ==0.2.0.11 @@ -936,7 +936,7 @@ default-package-overrides: - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 - - gitlab-haskell ==1.0.0.1 + - gitlab-haskell ==1.0.0.3 - gitlib ==3.1.3 - gitrev ==1.3.1 - gi-vte ==2.91.31 @@ -1021,7 +1021,7 @@ default-package-overrides: - haskoin-node ==0.18.1 - haskoin-store-data ==0.65.5 - hasktags ==0.72.0 - - hasql ==1.6.3.2 + - hasql ==1.6.3.3 - hasql-dynamic-statements ==0.3.1.2 - hasql-implicits ==0.1.1 - hasql-interpolate ==0.1.0.4 @@ -1056,7 +1056,7 @@ default-package-overrides: - hedgehog-quickcheck ==0.1.1 - hedis ==0.15.2 - hedn ==0.3.0.4 - - heist ==1.1.1.1 + - heist ==1.1.1.2 - here ==1.2.14 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.7 @@ -1075,11 +1075,11 @@ default-package-overrides: - hindent ==6.0.0 - hinfo ==0.0.3.0 - hinotify ==0.4.1 - - hint ==0.9.0.7 + - hint ==0.9.0.8 - histogram-fill ==0.9.1.0 - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - - hkgr ==0.4.3.1 + - hkgr ==0.4.3.2 - hledger ==1.30.1 - hledger-interest ==1.6.6 - hledger-lib ==1.30 @@ -1116,7 +1116,7 @@ default-package-overrides: - hpp ==0.6.5 - hpqtypes ==1.11.1.1 - hpqtypes-extras ==1.16.4.4 - - hreader ==1.1.0 + - hreader ==1.1.1 - hreader-lens ==0.1.3.0 - hruby ==0.5.0.0 - hsass ==0.8.0 @@ -1167,7 +1167,7 @@ default-package-overrides: - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.1.0.2 - hspec-leancheck ==0.0.6 - - hspec-megaparsec ==2.2.0 + - hspec-megaparsec ==2.2.1 - hspec-meta ==2.10.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 @@ -1181,10 +1181,10 @@ default-package-overrides: - HSvm ==0.1.1.3.25 - hsx2hs ==0.14.1.11 - hsx-jmacro ==7.3.8.2 - - HsYAML ==0.2.1.2 + - HsYAML ==0.2.1.3 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - - htaglib ==1.2.0 + - htaglib ==1.2.1 - HTF ==0.15.0.1 - html ==1.0.1.2 - html-conduit ==1.3.2.2 @@ -1197,7 +1197,7 @@ default-package-overrides: - HTTP ==4000.4.1 - http-api-data ==0.5 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.14 + - http-client ==0.7.15 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.0.5 @@ -1208,12 +1208,12 @@ default-package-overrides: - http-directory ==0.1.10 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - - http-io-streams ==0.1.6.2 + - http-io-streams ==0.1.6.3 - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - - http-streams ==0.8.9.8 + - http-streams ==0.8.9.9 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1333,7 +1333,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.10 + - isomorphism-class ==0.1.0.11 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1342,7 +1342,7 @@ default-package-overrides: - jira-wiki-markup ==1.5.1 - jl ==0.1.0 - jmacro ==0.6.18 - - jose ==0.10 + - jose ==0.10.0.1 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.5 - js-chart ==2.9.4.1 @@ -1388,14 +1388,14 @@ default-package-overrides: - krank ==0.3.0 - labels ==0.3.3 - lackey ==2.0.0.6 - - LambdaHack ==0.11.0.0 - - lame ==0.2.1 + - LambdaHack ==0.11.0.1 + - lame ==0.2.2 - language-avro ==0.1.4.0 - language-bash ==0.9.2 - language-c ==0.9.2 - language-c-quote ==0.13.0.1 - language-docker ==12.1.0 - - language-dot ==0.1.1 + - language-dot ==0.1.2 - language-glsl ==0.3.0 - language-java ==0.2.9 - language-javascript ==0.7.1.0 @@ -1515,7 +1515,7 @@ default-package-overrides: - matchable ==0.1.2.1 - mathexpr ==0.3.1.0 - math-extras ==0.1.1.0 - - math-functions ==0.3.4.2 + - math-functions ==0.3.4.3 - mathlist ==0.2.0.0 - matplotlib ==0.7.7 - matrices ==0.5.0 @@ -1562,7 +1562,7 @@ default-package-overrides: - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - - mime-types ==0.1.1.0 + - mime-types ==0.1.2.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minio-hs ==1.7.0 @@ -1619,7 +1619,7 @@ default-package-overrides: - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.4.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.4 + - monoid-subclasses ==1.2.4.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 @@ -1823,7 +1823,7 @@ default-package-overrides: - password ==3.0.2.1 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - path ==0.9.2 + - path ==0.9.5 - path-binary-instance ==0.1.0.1 - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 @@ -1848,7 +1848,7 @@ default-package-overrides: - pdf-toolbox-content ==0.1.1 - pdf-toolbox-core ==0.1.1 - pdf-toolbox-document ==0.1.2 - - peano ==0.1.0.1 + - peano ==0.1.0.2 - pedersen-commitment ==0.2.0 - pem ==0.2.4 - percent-format ==0.0.4 @@ -1921,7 +1921,7 @@ default-package-overrides: - posix-pty ==0.2.2 - possibly ==1.0.0.0 - postgres-options ==0.2.1.0 - - postgresql-binary ==0.13.1 + - postgresql-binary ==0.13.1.1 - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.7 @@ -1956,7 +1956,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.8 + - primitive-extras ==0.10.1.10 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 @@ -1985,17 +1985,17 @@ default-package-overrides: - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - PSQueue ==1.2.0 - - psqueues ==0.2.7.3 + - psqueues ==0.2.8.0 - pthread ==0.2.1 - ptr ==0.16.8.4 - ptr-poker ==0.1.2.13 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 - - pusher-http-haskell ==2.1.0.16 + - pusher-http-haskell ==2.1.0.17 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - - PyF ==0.11.1.1 + - PyF ==0.11.2.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.9 @@ -2048,7 +2048,7 @@ default-package-overrides: - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.0.3 - - Rattus ==0.5.1 + - Rattus ==0.5.1.1 - rawfilepath ==1.0.1 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -2067,7 +2067,7 @@ default-package-overrides: - rec-def ==0.2.2 - record-dot-preprocessor ==0.2.16 - record-hasfield ==1.0 - - recursion-schemes ==5.2.2.4 + - recursion-schemes ==5.2.2.5 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 @@ -2284,7 +2284,7 @@ default-package-overrides: - simple-expr ==0.1.1.0 - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - - simple-prompt ==0.2.1 + - simple-prompt ==0.2.2 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 @@ -2299,7 +2299,7 @@ default-package-overrides: - singletons-th ==3.1.1 - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - - size-based ==0.1.3.1 + - size-based ==0.1.3.2 - sized ==1.1.0.0 - skein ==1.0.9.4 - skews ==0.1.0.3 @@ -2311,7 +2311,7 @@ default-package-overrides: - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - - slave-thread ==1.1.0.2 + - slave-thread ==1.1.0.3 - slick ==1.2.1.0 - slist ==0.2.1.0 - slynx ==0.7.2.2 @@ -2376,10 +2376,10 @@ default-package-overrides: - stitch ==0.6.0.0 - stm-chans ==3.0.0.9 - stm-conduit ==4.0.1 - - stm-containers ==1.2.0.2 + - stm-containers ==1.2.0.3 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.13 + - stm-hamt ==1.2.0.14 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.7 - stm-split ==0.0.2.1 @@ -2410,7 +2410,7 @@ default-package-overrides: - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - strict-list ==0.1.7.2 - - strict-tuple ==0.1.5.2 + - strict-tuple ==0.1.5.3 - strict-wrapper ==0.0.0.0 - stringable ==0.1.3 - stringbuilder ==0.5.1 @@ -2512,7 +2512,7 @@ default-package-overrides: - tasty-program ==1.1.0 - tasty-quickcheck ==0.10.2 - tasty-rerun ==1.1.19 - - tasty-silver ==3.3.1.2 + - tasty-silver ==3.3.1.3 - tasty-smallcheck ==0.8.2 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 @@ -2523,17 +2523,17 @@ default-package-overrides: - teardown ==0.5.0.1 - telegram-bot-api ==6.7.1 - telegram-bot-simple ==0.12 - - template-haskell-compat-v0208 ==0.1.9.2 + - template-haskell-compat-v0208 ==0.1.9.3 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - tensors ==0.1.5 - - termbox ==1.1.0.1 + - termbox ==1.1.0.2 - termbox-banana ==1.0.0 - termbox-bindings-c ==0.1.0 - termbox-bindings-hs ==0.1.0 - - termbox-tea ==0.1.0 + - termbox-tea ==0.1.0.1 - terminal-progress-bar ==0.4.2 - terminal-size ==0.3.4 - termonad ==4.5.0.0 @@ -2545,7 +2545,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8.3 + - texmath ==0.12.8.4 - text-ansi ==0.2.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2789,7 +2789,7 @@ default-package-overrides: - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==6.0.2 + - versions ==6.0.3 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2834,7 +2834,7 @@ default-package-overrides: - warp ==3.3.25 - warp-tls ==3.3.6 - warp-tls-uid ==0.2.0.6 - - wave ==0.2.0 + - wave ==0.2.1 - wcwidth ==0.0.2 - webdriver ==0.11.0.0 - webex-teams-api ==0.2.0.1 @@ -2852,7 +2852,7 @@ default-package-overrides: - websockets ==0.12.7.3 - weigh ==0.0.16 - welford-online-mean-variance ==0.2.0.0 - - wide-word ==0.1.5.0 + - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==1.2.0.2 @@ -2925,10 +2925,10 @@ default-package-overrides: - yesod-auth ==1.6.11.2 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.1.1 + - yesod-auth-oauth2 ==0.7.1.2 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.5 + - yesod-core ==1.6.25.0 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.6 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9eaabf6c8a13..e3525ba90760 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -121,11 +121,8 @@ dont-distribute-packages: - Forestry - FormalGrammars - Foster - - Frames - - Frames-beam - Frames-dsv - Frames-map-reduce - - Frames-streamly - Frank - GLFW-OGL - GLFW-task @@ -706,6 +703,7 @@ dont-distribute-packages: - borel - both - breakout + - brick_2_1_1 - bricks - bricks-internal-test - bricks-parsec @@ -1019,6 +1017,8 @@ dont-distribute-packages: - curryer-rpc - cv-combinators - cypher + - dahdit-network + - dahdit-test - daino - dapi - darcs-benchmark @@ -1726,6 +1726,7 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters + - google-maps-geocoding - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -2031,7 +2032,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner - - hetzner_0_5_0_0 + - hetzner_0_6_0_0 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2173,6 +2174,9 @@ dont-distribute-packages: - hsql-odbc - hsql-postgresql - hsql-sqlite3 + - hsqml-datamodel-vinyl + - hsqml-demo-morris + - hsqml-morris - hsreadability - hssqlppp-th - hstar @@ -2678,6 +2682,12 @@ dont-distribute-packages: - micro-gateway - microformats2-types - midimory + - mig + - mig-client + - mig-extra + - mig-server + - mig-swagger-ui + - mig-wai - mighttpd - minecraft-data - minesweeper @@ -2810,6 +2820,7 @@ dont-distribute-packages: - named-servant-client - named-servant-server - nanq + - national-australia-bank - nats-queue - natural-number - nemesis-titan @@ -3504,6 +3515,7 @@ dont-distribute-packages: - selda-sqlite - selenium-server - semantic-source + - semantic-version - semi-iso - semialign-extras - semiring @@ -4103,6 +4115,7 @@ dont-distribute-packages: - voicebase - vorbiscomment - vpq + - vty-crossplatform - vty-ui-extras - waargonaut - wahsp diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 5138bf296570..2507663441ff 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2853,15 +2853,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_2_0" = callPackage + "Cabal_3_10_2_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.2.0"; - sha256 = "0nsnf14ja30vhsqf2scaqb1a4wjr8491i83nxi4r9m47m40yw8sc"; + version = "3.10.2.1"; + sha256 = "0jgm3q9dl6lrczwcc0mzqfqwxwdnk2m2lr6zkhygn2w982c651w8"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -3111,10 +3111,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.9.4"; - sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; - revision = "3"; - editedCabalFile = "0yppwi2cqy46dzasbdvq2120m8zrak1lj1qhlv5x7dzbdrji0529"; + version = "1.9.5"; + sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3129,10 +3127,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.9.3"; - sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f"; - revision = "4"; - editedCabalFile = "1slarc4f1803psmikq79x81cx4kwfyhwdclyjwx4ax1xbmdh0vsx"; + version = "1.9.4.1"; + sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -3149,10 +3145,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.9.4"; - sha256 = "0rkkmyfszzpnbw1s6lqg2fadkbvgqrxrp1rvj9v45ihzwnpbg758"; - revision = "1"; - editedCabalFile = "11q3hx4fprmkjp0v4m2c2fzvwqym5aa9wv2lbbr6vxq0wnigp7zz"; + version = "1.9.5.1"; + sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -3238,21 +3232,20 @@ self: { , Chart-diagrams, Chart-gtk, colour, containers, data-default-class , diagrams-cairo, diagrams-core, diagrams-lib, diagrams-postscript , diagrams-svg, doctest, gtk, lens, mtl, old-locale, old-time - , random, svg-builder, time + , QuickCheck, random, svg-builder, time, vector }: mkDerivation { pname = "Chart-tests"; - version = "1.9.3"; - sha256 = "1xhjd400xf235m345mhn98hjrvvv5qdr90paq4kixh2g0aswnhrd"; - revision = "2"; - editedCabalFile = "1i8dxpy504mnf7phg40i5v1p31hbj5xdx0ldz5a5y6irjwy9mawf"; + version = "1.9.4"; + sha256 = "1sy31dl4mwm25ajpgr0pgkr85py5raf7h76bnz06ybygjbnmc4fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring cairo Chart Chart-cairo Chart-diagrams Chart-gtk colour containers data-default-class diagrams-cairo diagrams-core diagrams-lib diagrams-postscript diagrams-svg gtk - lens mtl old-locale old-time random svg-builder time + lens mtl old-locale old-time QuickCheck random svg-builder time + vector ]; testHaskellDepends = [ base doctest ]; description = "Tests of the Charts library"; @@ -4756,6 +4749,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "Diff_0_5" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.5"; + sha256 = "0la5npl3zglzbsnlbksp0s6khb79cm6hbdxhy29sd3xivzg89k03"; + revision = "1"; + editedCabalFile = "1fxg0ibi80dq68draxfh1p0n4mkmyn7gm0b51jwpkq6rx8p9g2lw"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Diff algorithm in pure Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "DifferenceLogic" = callPackage ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }: mkDerivation { @@ -6671,16 +6684,16 @@ self: { "Frames" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contravariant, criterion, deepseq, directory, discrimination - , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes + , foldl, ghc-prim, hashable, hspec, HUnit, lens, pipes , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty , primitive, readable, regex-applicative, template-haskell - , temporary, text, transformers, unordered-containers, vector - , vector-th-unbox, vinyl + , temporary, text, tomland, transformers, unordered-containers + , validation-selective, vector, vector-th-unbox, vinyl }: mkDerivation { pname = "Frames"; - version = "0.7.3"; - sha256 = "0pn2i7qbjbmnzvj2ns3sh2m8i1yhc5w0y6lbzc4dsn2lqv5zpi0c"; + version = "0.7.4.2"; + sha256 = "0211qph0yc79al3dp43m12wnd5hxg9cpap0d5xh124zmaji0dq1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6690,14 +6703,13 @@ self: { vector vector-th-unbox vinyl ]; testHaskellDepends = [ - attoparsec base bytestring directory foldl hspec htoml HUnit lens - pipes pretty regex-applicative template-haskell temporary text - unordered-containers vinyl + attoparsec base bytestring directory foldl hspec HUnit lens pipes + pretty regex-applicative template-haskell temporary text tomland + unordered-containers validation-selective vinyl ]; benchmarkHaskellDepends = [ base criterion pipes transformers ]; - description = "Data frames For working with tabular data files"; + description = "Data frames for working with tabular data files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Frames-beam" = callPackage @@ -6722,6 +6734,7 @@ self: { description = "A library for accessing Postgres tables as in-memory data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Frames-dsv" = callPackage @@ -6802,6 +6815,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "Demo"; + broken = true; }) {}; "Frank" = callPackage @@ -9731,8 +9745,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "5"; - editedCabalFile = "14hl3nz13sdqyh4650wf4wh94c1kh8hrq2hxq9ykbippn10c3wlc"; + revision = "6"; + editedCabalFile = "1pwsga0ymdmd5ig9nzy3z4z61d0blgnybll7ik409x1wc4y2w692"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -11377,27 +11391,6 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.2.1.2"; - sha256 = "1k8azk85jqwqcfbw9bcpj3vqy3y0xd525c9pwm2hjppna8jkxm86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq mtl parsec text transformers - ]; - testHaskellDepends = [ - base bytestring containers mtl QuickCheck tasty tasty-quickcheck - text - ]; - description = "Pure Haskell YAML 1.2 processor"; - license = lib.licenses.gpl2Only; - }) {}; - - "HsYAML_0_2_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec - , QuickCheck, tasty, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HsYAML"; version = "0.2.1.3"; sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; isLibrary = true; @@ -11411,7 +11404,6 @@ self: { ]; description = "Pure Haskell YAML 1.2 processor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "HsYAML-aeson" = callPackage @@ -12208,6 +12200,8 @@ self: { pname = "JuicyPixels"; version = "3.3.8"; sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; + revision = "1"; + editedCabalFile = "1gbmls58qdlip8nsysy1qsnf7wrw8cgss7i7vmbxxnf9ni0iawn9"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -12926,8 +12920,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.11.0.0"; - sha256 = "19dmcbx0clzmblk3kh367dx3bbvmargjq1zkjhy2i1ixfpfcs9jm"; + version = "0.11.0.1"; + sha256 = "1qmjcz59qcvfwqpqqfy6xqmzkqx415xr5y5sdvrk0g8l8kdi30bm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17163,8 +17157,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.11.1.1"; - sha256 = "091k5lk0yd1nf4k25fb6948x2cxq0b3k8c0vpy9wwyrmyfcp0q7k"; + version = "0.11.2.1"; + sha256 = "02i2h8dj228w0d4vsjrllrc25hgmx7wys2jzlgq61z13jddc8rg8"; libraryHaskellDepends = [ base bytestring ghc mtl parsec template-haskell text time ]; @@ -17665,6 +17659,8 @@ self: { pname = "RSA"; version = "2.4.1"; sha256 = "0hchsqrxpfw7mqrqwscfy8ig1w2di6w3nxpzi873w0gibv2diibj"; + revision = "2"; + editedCabalFile = "090yzm99fmh7c6z4m9hbkasqhc3xlw104g2b6wnk77n1abd13ryj"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types SHA ]; @@ -17869,23 +17865,6 @@ self: { }) {}; "Rattus" = callPackage - ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space, transformers - }: - mkDerivation { - pname = "Rattus"; - version = "0.5.1"; - sha256 = "1bj5ca55s9b9dgv9svc082zplbcxgaj33ybh1kybx01qxa2phh74"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space transformers - ]; - testHaskellDepends = [ base containers ]; - description = "A modal FRP language"; - license = lib.licenses.bsd3; - }) {}; - - "Rattus_0_5_1_1" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space , transformers }: @@ -17900,7 +17879,6 @@ self: { testHaskellDepends = [ base containers ]; description = "A modal FRP language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -22100,8 +22078,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.5.0.0"; - sha256 = "1h6n8z1f097rgzymx4ivqbkwiv7c9ignkpbybp342rw3k6cd7rk3"; + version = "1.6.1.0"; + sha256 = "0i8n2cmh1fdi2x18lpq8fpzcdnjpa186s27ilfm6sprg5l8nhfqx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -22540,8 +22518,8 @@ self: { pname = "Workflow"; version = "0.8.3"; sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8"; - revision = "1"; - editedCabalFile = "0jy6hn1lx9wpq44ld96msgb6a2hb6cvryn1a39b4rq4iy3m45r8v"; + revision = "2"; + editedCabalFile = "0ijq5nxvlwzw9lpwi7r281mjlwkb7mpp6f318fij9g2hk034z0j7"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions extensible-exceptions mtl old-time RefSerialize stm TCache vector @@ -26653,8 +26631,8 @@ self: { }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.2.2"; - sha256 = "1p2w19gmlrcdsni7dj2bs3ajzn8a5460gwas97yl930gwiwivyif"; + version = "0.0.2.3"; + sha256 = "16yb6q4yaw3spwvcyd2vrdfsrdgib6cjbi2yjh8afdr4866afpik"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26820,8 +26798,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.1"; sha256 = "06x1l0a0dvzf8n2xmqny5qpsgdsl03xlh2z9x7wdxiykl8p4xd24"; - revision = "3"; - editedCabalFile = "11srm7kkslnicqvbk728kzpy58am8rz680f7l6axn2nfh5ykx8n6"; + revision = "4"; + editedCabalFile = "0yz6nml8lnd94iks9m0ma7x3sjs17djqh9h6krr52ikg69c4j2cy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27074,23 +27052,25 @@ self: { }) {}; "agda2hs" = callPackage - ({ mkDerivation, Agda, base, containers, deepseq, directory - , filepath, haskell-src-exts, mtl, syb, text, unordered-containers + ({ mkDerivation, Agda, base, bytestring, containers, deepseq + , directory, filepath, haskell-src-exts, mtl, process, syb, text + , unordered-containers, yaml-light }: mkDerivation { pname = "agda2hs"; - version = "1.0"; - sha256 = "1r2ac4sqm86w88hk3fwkv0zviv7zy9nykw6cayg0240k1sw6j4qb"; + version = "1.1"; + sha256 = "1wwrvsbpa0hmmqv5d4k348v3j67v46qv8hyx31y01ycxlz2dz72v"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - Agda base containers deepseq directory filepath haskell-src-exts - mtl syb text unordered-containers + Agda base bytestring containers deepseq directory filepath + haskell-src-exts mtl process syb text unordered-containers + yaml-light ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "agda2hs"; broken = true; }) {}; @@ -27166,8 +27146,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "agreeing"; - version = "0.2.0.0"; - sha256 = "1zhxzhxhqanchr64rkbwzrn9q7lhmylsggf6ax0zai0zg9sk56yc"; + version = "0.2.2.0"; + sha256 = "07db486ki3bd9cn57icnhb53497a8i2vzw9p4pp5q34780p6k4i6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Idiomatic data structure for agreement"; @@ -27374,8 +27354,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "6.0.0"; - sha256 = "1pqib3g333zhzpra22qxilwbw6v54dnzciqwi5668rhwnv66a8h4"; + version = "6.1"; + sha256 = "16f4vp2xfkb7y62kcb3rmfs8ksj1hrn92add446pi6lsrcrz4pk6"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27538,8 +27518,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "6.0.0"; - sha256 = "1fr6zrf401sg5a8w3k0fman4d6qg9cfy9j1vsw58l5z609ma79jx"; + version = "6.1"; + sha256 = "14x2ddny5a68bm66w29nzsmvmwhxj37yf4jl60wp4h5bvf3k7s3j"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -27676,13 +27656,13 @@ self: { mainProgram = "alex"; }) {}; - "alex_3_4_0_0" = callPackage + "alex_3_4_0_1" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { pname = "alex"; - version = "3.4.0.0"; - sha256 = "13p3mcmjcz0sgpr5rsbw8fw492b972zh671d6ylhxi4r2gid873s"; + version = "3.4.0.1"; + sha256 = "0dlz0izzawy1x9p2xpfblkma7w20f280r44h67kfggclx3yfcf2c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -27995,8 +27975,8 @@ self: { pname = "algebraic-graphs"; version = "0.7"; sha256 = "0s75h92qb9jdfdyzh0fraxpzj0jl4xvcbqq9cwgba2k9306rl5ai"; - revision = "1"; - editedCabalFile = "1z9xls7riv3rlp1vjymvj7z64y8w0x3865d2ad2dzrwsdgzcsndf"; + revision = "2"; + editedCabalFile = "1psgkw2qcdv91cij564jzlsyx7qjs8z7y7y6lfhciilbzkzvpy3m"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -28458,8 +28438,8 @@ self: { }: mkDerivation { pname = "alphachar"; - version = "0.0.4"; - sha256 = "02r11cm50zhi0rnc251i8cfg0kb8lxanwm6472v55f8q60y9b4g0"; + version = "0.0.5"; + sha256 = "0dj1cyfp82sn8fj9zx4471fxfnnzwgfzx5y4xg8sxa719nyq7d29"; libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty @@ -35927,6 +35907,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ansi-terminal-game_1_9_2_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, colour, containers, exceptions, file-embed, hspec + , hspec-discover, linebreak, mintty, mtl, QuickCheck, random, split + , terminal-size, timers-tick, unidecode + }: + mkDerivation { + pname = "ansi-terminal-game"; + version = "1.9.2.0"; + sha256 = "16j4da1q6vhdy90byadm4bkai4h59qxpdi00skffn3krk5wdv3hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions file-embed linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions file-embed hspec linebreak mintty mtl QuickCheck random + split terminal-size timers-tick unidecode + ]; + testToolDepends = [ hspec-discover ]; + description = "cross-platform library for terminal games"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-terminal-types" = callPackage ({ mkDerivation, base, colour }: mkDerivation { @@ -36725,10 +36733,8 @@ self: { }: mkDerivation { pname = "apecs-stm"; - version = "0.1.5"; - sha256 = "10zfmc1zgmw5fkrrcs0mnsb2h44b0zfn2y7w1ld47skvmz580dxp"; - revision = "1"; - editedCabalFile = "01rhwqs69bx09p2nqp9c01jhcqnfdfiisw6kck9gjq0h68j2rdib"; + version = "0.2"; + sha256 = "03r20w5q6c8z4cv8z60v66hd9w831g3qsa6n5m96mdwi6vjxh1nl"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -42072,6 +42078,22 @@ self: { mainProgram = "autoexporter"; }) {}; + "autoexporter_2_0_0_9" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "2.0.0.9"; + sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "autoexporter"; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -44363,22 +44385,6 @@ self: { }: mkDerivation { pname = "barbies"; - version = "2.0.4.0"; - sha256 = "0v8bckxi58fkqgf1i1xd3100wp792pzd319xlfvmmw8z0ii1g872"; - libraryHaskellDepends = [ base distributive transformers ]; - testHaskellDepends = [ - base distributive QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Classes for working with types that can change clothes"; - license = lib.licenses.bsd3; - }) {}; - - "barbies_2_0_5_0" = callPackage - ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers - }: - mkDerivation { - pname = "barbies"; version = "2.0.5.0"; sha256 = "1j8c45k1x9vi9w44qnc8nyy0y4p97clvbq07vby7wn26zdawl8nm"; libraryHaskellDepends = [ base distributive transformers ]; @@ -44387,7 +44393,6 @@ self: { ]; description = "Classes for working with types that can change clothes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "barbies-layered" = callPackage @@ -45068,8 +45073,8 @@ self: { pname = "base64"; version = "0.4.2.4"; sha256 = "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4"; - revision = "3"; - editedCabalFile = "1mcr0pp5b7xnj68m8d42pw9pgjj6p5v1p0g93s78n0nm605kl40h"; + revision = "4"; + editedCabalFile = "1lc32d5nxk0ry1pfn3ss55hi4cv6qj5nkkdn3j4y3lrdwyv7kbw2"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -45426,8 +45431,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.2.0.3"; - sha256 = "1aa3iwfbhqczmnnribz79nns5ppc397pwv4hx277jbfdxx0m8ks8"; + version = "0.3.0"; + sha256 = "1swyphr1vnk2nvjadvscxm5xb9vlkja0jardd8nzagfb1jm2b0f7"; libraryHaskellDepends = [ base deepseq generics-sop QuickCheck text ]; @@ -46288,8 +46293,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.4"; - sha256 = "0bdz64rq6vri2kri5c6rja6x3dn4k62d0id462ar2dxwqaj8cqjc"; + version = "0.14.5"; + sha256 = "1ai026mhk42pw96v3p0imlrz9hfnr7cv21019bkqakrc3pmc0y6n"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -46502,6 +46507,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "benc" = callPackage + ({ mkDerivation, AttoBencode, base, bencode, bencoding, bytestring + , containers, deepseq, primitive, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "benc"; + version = "0.1.0.0"; + sha256 = "1nwzd89kgzc7zcswicrv848igf7p1gpgli1pj8h1dc5jnlikz3ka"; + libraryHaskellDepends = [ + base bytestring containers primitive text transformers vector + ]; + testHaskellDepends = [ + base bytestring containers tasty tasty-hunit tasty-quickcheck text + vector + ]; + benchmarkHaskellDepends = [ + AttoBencode base bencode bencoding bytestring containers deepseq + tasty tasty-bench tasty-hunit text transformers vector + ]; + description = "Bencode encoding and decoding library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bench" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, process , silently, text, turtle @@ -46582,8 +46613,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.22"; - sha256 = "1ygyx4dc6b7qkyjvrfd55kbknp2yp8srk0lw2fwdig29qhq6m8f6"; + version = "0.2.2.23"; + sha256 = "0fys04n01484hf4gxgxkwr890d6psaphw0j4vnq82p36fa5zdjkc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -47388,6 +47419,8 @@ self: { pname = "bin"; version = "0.1.3"; sha256 = "14kd29szzpngyvibylkwh6yfyrpyhxhnjf6590kq0dkfpmrzg77v"; + revision = "1"; + editedCabalFile = "0schv2ilmkd37wsw777lx44x4nfs5pn0d7n8wkamzi8m8h0qi5l9"; libraryHaskellDepends = [ base boring dec deepseq fin hashable QuickCheck some ]; @@ -47908,8 +47941,8 @@ self: { pname = "binary-tagged"; version = "0.3.1"; sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; - revision = "3"; - editedCabalFile = "1r8bwv9jkjl7ygmyhzbh9knsfzc8sd8lvkzvh00rn7dibs0kid1q"; + revision = "4"; + editedCabalFile = "0x847prfb54pb5wz244krky58ahs698vlvj4bk5fksr5h7fzxds6"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -52731,8 +52764,8 @@ self: { pname = "bound-extras"; version = "0.0.2"; sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; - revision = "2"; - editedCabalFile = "1735mxrj5f05b3dikhj1c2vz2a5hl5plnx2wa71bizwnc6p6qa7d"; + revision = "3"; + editedCabalFile = "0b5zywbbps0j7m3cndgwvg8d8kgcyvi4rnmnv2shavlhwnjlbawa"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -53253,6 +53286,8 @@ self: { pname = "brick"; version = "1.9"; sha256 = "023fmgq8bgv05jpsr5saisz1jpkimkjycm1xza9gx5sxf6z6sjz3"; + revision = "1"; + editedCabalFile = "07kpxpxizmifl7jpavv6ahars3hm7jbs93i2hl81ri93h6ac69i1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53267,25 +53302,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_10" = callPackage + "brick_2_1_1" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens , microlens-mtl, microlens-th, mtl, QuickCheck, stm - , template-haskell, text, text-zipper, unix, vector, vty, word-wrap + , template-haskell, text, text-zipper, unix-compat, vector, vty + , vty-crossplatform, vty-unix, word-wrap }: mkDerivation { pname = "brick"; - version = "1.10"; - sha256 = "13s5vy5q450v4aynf35sdhl9idnyy96gz27x869yfrqpghb0q6br"; + version = "2.1.1"; + sha256 = "07mk68sw5bl333lv5lrnnnf1c9d80rd4cmaspxn3xsrhf5phsa1h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap bytestring config-ini containers data-clist deepseq directory exceptions filepath microlens microlens-mtl microlens-th - mtl stm template-haskell text text-zipper unix vector vty word-wrap + mtl stm template-haskell text text-zipper unix-compat vector vty + vty-crossplatform word-wrap ]; testHaskellDepends = [ - base containers microlens QuickCheck vector vty + base containers microlens QuickCheck vector vty vty-unix ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; @@ -53352,8 +53389,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.6"; - sha256 = "0m4m6sw4fhfy75dirnwchg3jr175d9c7splkhfkb6p4i8995m5kl"; + version = "0.1.1.8"; + sha256 = "0zaqyhvzw5mw5xj3n71578nslg5h3i5k354xck3f2si2sp73kzxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53425,8 +53462,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.4"; - sha256 = "1mjwzkh6236y09h8xqzcgddypyipr2h8b4x308lh51cqb07rjczq"; + version = "2.2.0.6"; + sha256 = "1ba3g0qx0hgybj9yiy7afrxfj6nyfqqhj8pwf7lcb5jpm5sqn91d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53923,8 +53960,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "3"; - editedCabalFile = "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd"; + revision = "4"; + editedCabalFile = "0fx431lgf3mhlg4fg9yqs49c43pwrypf4mdi7vx3q78vqdqp7khw"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -54818,6 +54855,27 @@ self: { license = lib.licenses.mit; }) {}; + "burrito_2_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.7"; + sha256 = "1b7xijr8ry4q1k3ix2nzbrvaiwrk4gdzbl79kxl3d7s2zxgnngww"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -55910,27 +55968,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.10"; - sha256 = "0g9npnp691v34yyfhsz95r8jahvnxdcadv0xl8amq36n9hi2la19"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_11" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -55946,7 +55983,6 @@ self: { benchmarkHaskellDepends = [ base-prelude bytestring criterion ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -56472,8 +56508,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.0.1"; - sha256 = "1fk5dz1gnd5rkf58m9m1ynildmajv1if3ymr2xg2gylvnygwr4rn"; + version = "0.4.0.2"; + sha256 = "0hgf5zbidg0nwiyxiskjxpn1dll6zabry4miy06awqwx8zjf24hn"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3Only; @@ -57065,35 +57101,32 @@ self: { }) {}; "cabal-install" = callPackage - ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, Cabal-described, cabal-install-solver - , Cabal-QuickCheck, Cabal-syntax, Cabal-tree-diff, containers - , cryptohash-sha256, directory, echo, edit-distance, exceptions - , filepath, hackage-security, hashable, HTTP, lukko, mtl - , network-uri, parsec, pretty, pretty-show, process, QuickCheck - , random, regex-base, regex-posix, resolv, safe-exceptions, stm - , tagged, tar, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unix, zlib + ({ mkDerivation, array, async, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, Cabal-described + , cabal-install-solver, Cabal-QuickCheck, Cabal-syntax + , Cabal-tree-diff, containers, cryptohash-sha256, directory, echo + , edit-distance, exceptions, filepath, hackage-security, hashable + , HTTP, lukko, mtl, network-uri, parsec, pretty, pretty-show + , process, QuickCheck, random, regex-base, regex-posix, resolv + , safe-exceptions, stm, tagged, tar, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.10.1.0"; - sha256 = "13c3qx0qw7kizaj2dpgl2y3pj86pgqvmkck20w726jalamlf6pcr"; - revision = "1"; - editedCabalFile = "0h1ra9kw7mk70202whiphbdyvknm7jbhqhkgw4h8abb1sgffhs3n"; + version = "3.10.2.1"; + sha256 = "0i42ky2p12cnrsx9fljfbcgdri3xbpzgj0xg4prdfh1dyz2j0dnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - cabal-install-solver Cabal-syntax containers cryptohash-sha256 - directory echo edit-distance exceptions filepath hackage-security - hashable HTTP lukko mtl network-uri parsec pretty process random - regex-base regex-posix resolv safe-exceptions stm tar text time - unix zlib - ]; - executableHaskellDepends = [ - base Cabal Cabal-syntax directory filepath + array async base base16-bytestring base64-bytestring binary + bytestring Cabal cabal-install-solver Cabal-syntax containers + cryptohash-sha256 directory echo edit-distance exceptions filepath + hackage-security hashable HTTP lukko mtl network-uri parsec pretty + process random regex-base regex-posix resolv safe-exceptions stm + tar text time unix zlib ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ array base bytestring Cabal Cabal-described cabal-install-solver Cabal-QuickCheck Cabal-syntax Cabal-tree-diff containers directory @@ -57232,17 +57265,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "cabal-install-solver_3_10_1_0" = callPackage + "cabal-install-solver_3_10_2_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax , containers, edit-distance, filepath, mtl, pretty, tasty , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "cabal-install-solver"; - version = "3.10.1.0"; - sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c"; - revision = "1"; - editedCabalFile = "1l3qhaiv0m2xc5vscggd2drinam1k4x0l3vfvvz15xrpvxypdv4d"; + version = "3.10.2.1"; + sha256 = "02nllpg35i44chs5hi3kmv2kisxqlh27l5vs9aips2abphl0gl4i"; libraryHaskellDepends = [ array base bytestring Cabal Cabal-syntax containers edit-distance filepath mtl pretty transformers @@ -57414,8 +57445,8 @@ self: { }: mkDerivation { pname = "cabal-plan-bounds"; - version = "0.1.5"; - sha256 = "0585mjv6vj8iggkazc53ccl8nvv35vk6m9r2y0zs47ifijdzl2f5"; + version = "0.1.5.1"; + sha256 = "11b0k5hm9hf4bnlyapb7a5r3gi1lgfn9pmsvb7b9asbkqyllf01a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57485,6 +57516,30 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-rpm_2_1_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file + , directory, extra, filepath, http-client, http-client-tls + , http-conduit, http-query, optparse-applicative, process + , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.1.4"; + sha256 = "059vqbh97cydybvbwbn5cgrpw3bx7rkizy8j0nsqfyaxjvvj8lvg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring Cabal cached-json-file directory extra + filepath http-client http-client-tls http-conduit http-query + optparse-applicative process simple-cabal simple-cmd + simple-cmd-args text time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-rpm"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58059,6 +58114,8 @@ self: { pname = "cached"; version = "0.1.0.0"; sha256 = "19x5pwcdkhmk32w9ccb2ixc73k2hhqki61yi39lahda5k86jisdv"; + revision = "1"; + editedCabalFile = "07hav3nr26pkpcvhqhgz915gsl59gx5sarmk27v5zv4682zzqzpq"; libraryHaskellDepends = [ base containers protolude shake text ]; testHaskellDepends = [ base containers directory doctest filepath protolude QuickCheck @@ -60705,30 +60762,34 @@ self: { "cattrap" = callPackage ({ mkDerivation, balkon, base, bytestring, containers, css-syntax - , fontconfig-pure, gl, GLUT, harfbuzz-pure, hspec, QuickCheck - , scientific, stylist-traits, text, unordered-containers, xml + , data-array-byte, deepseq, directory, file-embed, fontconfig-pure + , harfbuzz-pure, hspec, html-conduit, hurl, hurl-xml, network-uri + , parallel, QuickCheck, scientific, sdl2, stylist, stylist-traits + , text, unordered-containers, xml, xml-conduit, xml-conduit-stylist }: mkDerivation { pname = "cattrap"; - version = "0.2.0.0"; - sha256 = "1xl4nv2p1qcxijpvd4lgxx5qggzxf75jv2lz51yqw6wj6237c09s"; + version = "0.4.0.0"; + sha256 = "0j9pkj5lnyxmi9bvmbkaf73hfy923hz3s20lpaljh092cfw5dh31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - balkon base bytestring containers css-syntax fontconfig-pure - harfbuzz-pure scientific stylist-traits text unordered-containers + balkon base bytestring containers css-syntax data-array-byte + deepseq fontconfig-pure harfbuzz-pure parallel scientific + stylist-traits text unordered-containers ]; executableHaskellDepends = [ - base css-syntax gl GLUT stylist-traits text xml + base bytestring containers css-syntax deepseq directory file-embed + fontconfig-pure html-conduit hurl hurl-xml network-uri sdl2 stylist + stylist-traits text xml xml-conduit xml-conduit-stylist ]; testHaskellDepends = [ - base css-syntax hspec QuickCheck stylist-traits - unordered-containers + balkon base css-syntax harfbuzz-pure hspec QuickCheck + stylist-traits unordered-containers ]; description = "Lays out boxes according to the CSS Box Model"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - mainProgram = "cattrap"; }) {}; "cautious" = callPackage @@ -60931,8 +60992,8 @@ self: { pname = "cborg-json"; version = "0.2.5.0"; sha256 = "1m3w0yyp6xb07fx04g5c52pb0b46vpkgpi32w1c8bz867x2p7hsq"; - revision = "1"; - editedCabalFile = "0zzn2p6yl9mqw7agm5w7iiz105078gv66vxr8bqazilgssqk5wyg"; + revision = "2"; + editedCabalFile = "1bd2s7dr9jl88pd2wwllb8badhshafnnkq6lmds93sxavv4i92r8"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -62057,6 +62118,18 @@ self: { broken = true; }) {}; + "character-ps" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "character-ps"; + version = "0.1"; + sha256 = "172jq74b9cs7yyyng1h2yjs1ypg7w6sk5a38j4z6s8wbwgyp3pi2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Pattern synonyms for ASCII characters for Word8, Word16 etc"; + license = lib.licenses.bsd3; + }) {}; + "charade" = callPackage ({ mkDerivation, base, configurator, containers, filepath, heist , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras @@ -62847,29 +62920,6 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, adjunctions, base, distributive, mtl, primitive - , QuickCheck, random, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "chimera"; - version = "0.3.3.0"; - sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; - revision = "1"; - editedCabalFile = "197xa0hgf2w4yhifnkqck6biipz8ffjg61y59plamb9rjv62k0bv"; - libraryHaskellDepends = [ - adjunctions base distributive mtl primitive transformers vector - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck - vector - ]; - benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; - description = "Lazy infinite streams with O(1) indexing and applications for memoization"; - license = lib.licenses.bsd3; - }) {}; - - "chimera_0_3_4_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, infinite-list , mtl, primitive, QuickCheck, random, tasty, tasty-bench , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -62890,7 +62940,6 @@ self: { benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; description = "Lazy infinite streams with O(1) indexing and applications for memoization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "chiphunk" = callPackage @@ -63249,6 +63298,8 @@ self: { pname = "chronos"; version = "1.1.5.1"; sha256 = "0nld5xfqgihqf2lichd5ym60knwsfp40l4mn8qg6pxvydgwdcsw8"; + revision = "1"; + editedCabalFile = "13iikpg8m61b56q8h74dhql01yb8jmc52c9chr8kkr7q6knzyw1f"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -64358,14 +64409,14 @@ self: { , deepseq, directory, exceptions, extra, filepath, ghc, ghc-bignum , ghc-boot, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl - , primitive, process, reflection, split, template-haskell, text - , time, transformers, uniplate, unix, unordered-containers - , utf8-string, vector + , primitive, process, reflection, split, string-interpolate + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "clash-ghc"; - version = "1.6.6"; - sha256 = "0hzcqkbmpwybvi5rvzhkf3n7rdbimbqzyi1ijagfsivjvfkxs1m5"; + version = "1.8.0"; + sha256 = "1cjqm23d2977aiya81i9q1npyd4zxmbv81k4agqggdkl8h9rcn8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64374,8 +64425,8 @@ self: { exceptions extra filepath ghc ghc-bignum ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable haskeline lens mtl primitive process reflection split - template-haskell text time transformers uniplate unix - unordered-containers utf8-string vector + string-interpolate template-haskell text time transformers uniplate + unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ base ]; description = "Clash: a functional hardware description language - GHC frontend"; @@ -64388,19 +64439,20 @@ self: { , attoparsec, attoparsec-aeson, base, base16-bytestring, binary , bytestring, clash-prelude, concurrent-supply, containers , cryptohash-sha256, data-binary-ieee754, data-default, deepseq - , directory, dlist, exceptions, extra, filepath, ghc, ghc-bignum - , ghc-boot-th, ghc-typelits-knownnat, Glob, hashable - , haskell-src-exts, haskell-src-meta, hint, interpolate, lens, mtl - , ordered-containers, pretty-show, prettyprinter, primitive - , quickcheck-text, stringsearch, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, time, transformers, trifecta, unordered-containers, vector - , vector-binary-instances, yaml + , directory, dlist, doctest-parallel, exceptions, extra, filepath + , ghc, ghc-bignum, ghc-boot-th, ghc-typelits-knownnat, Glob + , hashable, haskell-src-exts, haskell-src-meta, hint, infinite-list + , lens, mtl, ordered-containers, pretty-show, prettyprinter + , prettyprinter-interp, primitive, quickcheck-text + , string-interpolate, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, temporary + , terminal-size, text, time, transformers, trifecta + , unordered-containers, vector, vector-binary-instances, yaml }: mkDerivation { pname = "clash-lib"; - version = "1.6.6"; - sha256 = "0v31cp9f6bciag31f5zdxmz1cdlk2aw3skrgam40psaxmksih6ns"; + version = "1.8.0"; + sha256 = "1f2kmgasgbpnw0gd308mhzc7qb4ng36js7l9gvk0xgm425lxavq0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64410,10 +64462,10 @@ self: { clash-prelude concurrent-supply containers cryptohash-sha256 data-binary-ieee754 data-default deepseq directory dlist exceptions extra filepath ghc ghc-bignum ghc-boot-th hashable haskell-src-meta - hint interpolate lens mtl ordered-containers pretty-show - prettyprinter primitive template-haskell temporary terminal-size - text time transformers trifecta unordered-containers vector - vector-binary-instances yaml + hint infinite-list lens mtl ordered-containers pretty-show + prettyprinter prettyprinter-interp primitive string-interpolate + template-haskell temporary terminal-size text time transformers + trifecta unordered-containers vector vector-binary-instances yaml ]; executableHaskellDepends = [ aeson attoparsec-aeson base bytestring containers deepseq directory @@ -64422,9 +64474,10 @@ self: { testHaskellDepends = [ aeson aeson-pretty attoparsec-aeson base base16-bytestring bytestring clash-prelude concurrent-supply containers data-default - deepseq ghc ghc-typelits-knownnat haskell-src-exts lens pretty-show - quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell - text transformers unordered-containers + deepseq doctest-parallel filepath ghc ghc-typelits-knownnat + haskell-src-exts lens pretty-show quickcheck-text tasty tasty-hunit + tasty-quickcheck tasty-th template-haskell text transformers + unordered-containers ]; description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; @@ -64440,8 +64493,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.6.6"; - sha256 = "1hnhlkimgrhcn26y78xpf4f3p5dix4qp0cjlvpp1vz1w9fl2va6v"; + version = "1.8.0"; + sha256 = "0bmlrwwm5hp67fm8a9d089fwmrcnknvd2gijriwzk1kxbvfyhynk"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -64474,24 +64527,25 @@ self: { , data-default-class, deepseq, directory, doctest-parallel, extra , filepath, ghc-bignum, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, half, hashable - , hedgehog, hint, interpolate, lens, QuickCheck + , hedgehog, hint, infinite-list, lens, mtl, QuickCheck , quickcheck-classes-base, recursion-schemes, reflection - , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, th-abstraction, th-lift - , th-orphans, time, transformers, type-errors, uniplate, vector + , singletons, string-interpolate, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text + , th-abstraction, th-lift, th-orphans, time, transformers + , type-errors, uniplate, vector }: mkDerivation { pname = "clash-prelude"; - version = "1.6.6"; - sha256 = "06dwpyf4f9i2l7gqd67by3j5jjzj5wd5rs8bqbw0b718idmcga8z"; + version = "1.8.0"; + sha256 = "01psmi229lgpfc10p0p4gvpqfklwfmgvjwvqifnv77d4jbqjimiq"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise half hashable interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - th-abstraction th-lift th-orphans time transformers type-errors - uniplate vector + ghc-typelits-natnormalise half hashable infinite-list lens mtl + QuickCheck recursion-schemes reflection singletons + string-interpolate template-haskell text th-abstraction th-lift + th-orphans time transformers type-errors uniplate vector ]; testHaskellDepends = [ base bytestring deepseq doctest-parallel filepath @@ -64514,8 +64568,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.6.6"; - sha256 = "0li04hy6jj92wcp9j5gr92a71w1pbzj87hv75m66i94ifj6ybq39"; + version = "1.8.0"; + sha256 = "0vll5ff7dhjx2q9xpj3q961dmhgi306w577kxfm11sccvjix2pbh"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -66039,8 +66093,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.6"; - sha256 = "07231ywvygmkdlyy64lp3ad7m4m4mfymf9swl4j57pgwyg7dp8z5"; + version = "2.0.7"; + sha256 = "0pvpfp283pjyb4cyingc3b77yjyh76i9jv5k282hkng14am0j0wf"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -66820,27 +66874,12 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.0"; - sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; - revision = "2"; - editedCabalFile = "0zfmgjdp2hp7x9a1kma1mvn51mm4kdhvrzq450mk0ysh026xfjls"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = lib.licenses.mpl20; - }) {}; - - "co-log-core_0_3_2_1" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "co-log-core"; version = "0.3.2.1"; sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "co-log-json" = callPackage @@ -66976,8 +67015,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.5.1"; - sha256 = "0k26qzrd1j744dg5is26gmh99xawf25wzlj72wmlc56nx5rc6cfx"; + version = "0.1.5.2"; + sha256 = "1pyr9f30bc3nl777a41ddnfb78bx4y44rbrs3kcxrd5j7nn5n3gv"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers data-msgpack deepseq filepath http-conduit hyraxAbif lens linear @@ -67619,6 +67658,32 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) clp;}; + "coinor-clp_0_0_0_1" = callPackage + ({ mkDerivation, base, clp, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, linear-programming + , non-empty, QuickCheck, random, transformers, utility-ht + }: + mkDerivation { + pname = "coinor-clp"; + version = "0.0.0.1"; + sha256 = "02jrmb0fbgwzhgcnhv4hh1flz87rvs1xq3sbjrjac7cxxyl3inba"; + libraryHaskellDepends = [ + base comfort-array deepseq linear-programming non-empty QuickCheck + transformers utility-ht + ]; + libraryPkgconfigDepends = [ clp ]; + testHaskellDepends = [ + base comfort-array doctest-exitcode-stdio doctest-lib + linear-programming non-empty QuickCheck random transformers + utility-ht + ]; + description = "Linear Programming using COIN-OR/CLP and comfort-array"; + license = lib.licenses.bsd3; + badPlatforms = [ "aarch64-linux" ]; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; + }) {inherit (pkgs) clp;}; + "cointracking-imports" = callPackage ({ mkDerivation, base, base-compat-batteries, bytestring, cassava , filepath, hedgehog, lens, scientific, tasty, tasty-hedgehog @@ -68694,8 +68759,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2.3"; - sha256 = "01fr1227qlajzxbzai7msxgigqfmcc1ydhyr70asdn3wij8dwnkl"; + version = "0.2.4"; + sha256 = "0mhxk8znkjmc17dr7ssikijjgis19mrp4xwc0r1c3vki4vwwwzsm"; libraryHaskellDepends = [ base bytestring containers parsec text transformers unicode-data unicode-transforms @@ -68759,8 +68824,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.6"; - sha256 = "0b26h9fmr5pqv0d66az3af38ha07jkxrf5874m0k7i9ymaxwbckg"; + version = "0.2.4"; + sha256 = "1yrz32lbipzwvxmy4i3vkvs735jfd9jvlhfzh6xm2nx2rjapnx9n"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -69242,33 +69307,6 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.13.0"; - sha256 = "0lngdcswabyby3glzd8nn7cx35wl0hv1xpzc16j0bc0qfg09vkfi"; - libraryHaskellDepends = [ - base containers deepseq mtl QuickCheck template-haskell - th-expand-syns transformers tree-view - ]; - testHaskellDepends = [ - base containers deepseq HUnit mtl QuickCheck template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 - th-expand-syns transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq mtl QuickCheck random - template-haskell th-expand-syns transformers uniplate - ]; - description = "Compositional Data Types"; - license = lib.licenses.bsd3; - }) {}; - - "compdata_0_13_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl - , QuickCheck, random, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, th-expand-syns - , transformers, tree-view, uniplate - }: - mkDerivation { - pname = "compdata"; version = "0.13.1"; sha256 = "001k1pd28cgbspd2n74p29hc69ch9mmkqfazki7qj17kzcaq5n2l"; revision = "1"; @@ -69288,7 +69326,6 @@ self: { ]; description = "Compositional Data Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -71776,6 +71813,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "config-ini_0_2_7_0" = callPackage + ({ mkDerivation, base, containers, directory, hedgehog, ini + , megaparsec, text, transformers, unordered-containers + }: + mkDerivation { + pname = "config-ini"; + version = "0.2.7.0"; + sha256 = "00b9b590566hrxrjn31jkq70768dnrzzsjrasrnhdvd6p92iq5rs"; + libraryHaskellDepends = [ + base containers megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + base containers directory hedgehog ini text unordered-containers + ]; + description = "A library for simple INI-based configuration files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -72075,6 +72131,32 @@ self: { broken = true; }) {}; + "conformance" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "conformance"; + version = "0.1.0.0"; + sha256 = "18dzj2arhpmh6g8l7h5hd89i4v5f4001vfzcssnh5r2y29cgyljc"; + libraryHaskellDepends = [ base mtl ]; + license = lib.licenses.mit; + }) {}; + + "conformance-gen" = callPackage + ({ mkDerivation, base, conformance, genvalidity-sydtest, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "conformance-gen"; + version = "0.0.0.0"; + sha256 = "0nj4fn2x9dr2pd3cxznwlh05gn7m9279mbr0nw73qixz01vyx7mj"; + libraryHaskellDepends = [ base conformance sydtest ]; + testHaskellDepends = [ + base conformance genvalidity-sydtest sydtest + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + "confsolve" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio , system-filepath, text, time, unordered-containers @@ -73292,21 +73374,6 @@ self: { }: mkDerivation { pname = "contravariant-extras"; - version = "0.3.5.3"; - sha256 = "0r4bnl4gi6zd46h6fjkr33hw37rjxwwr00m08vgbzgkdp853g1ba"; - libraryHaskellDepends = [ - base contravariant template-haskell template-haskell-compat-v0208 - ]; - description = "Extras for the \"contravariant\" package"; - license = lib.licenses.mit; - }) {}; - - "contravariant-extras_0_3_5_4" = callPackage - ({ mkDerivation, base, contravariant, template-haskell - , template-haskell-compat-v0208 - }: - mkDerivation { - pname = "contravariant-extras"; version = "0.3.5.4"; sha256 = "13i9cip0qb8piib2sfq35qvb978npra2w53zvc28fxxnik9icfig"; libraryHaskellDepends = [ @@ -73314,7 +73381,6 @@ self: { ]; description = "Extras for the \"contravariant\" package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "control" = callPackage @@ -73866,8 +73932,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.16.1"; - sha256 = "1rbr9wq2ag8qzq696i833qzqhnl634dkssvvnz3ig0i0c8qai2c7"; + version = "3.17"; + sha256 = "1vam9nwkpdh43p34ni6kwjpzbdrw16d6wyq02kc2s513zkh46755"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73888,8 +73954,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.16.1"; - sha256 = "028alpcppzcpj6vhbqmay9jvpw7p2ycw5ck92330zjh03iky51lf"; + version = "3.17"; + sha256 = "1zq87sj9s7n6cgsgdz3sk9fjpkns25w8f6f2f6036f972l204vl3"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -73927,8 +73993,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.16.1"; - sha256 = "09z4ar0rip79gzf7a8bm6l2lx71y4cvh1dxpr4qjvys2mql7kb1k"; + version = "3.17"; + sha256 = "1hzvcvla69y13qwbaq52qb20hk7sln7fv7gz07n36827bp1swjbc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -73962,8 +74028,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.16.1"; - sha256 = "0lklzprscm02dhd78ny5i34c7820571k78abjblcbjnwrkd6hm8h"; + version = "3.17"; + sha256 = "1ywh4pnr69dd2h3siiwgvbbs9na2l125lipd93y5lhm6ziylm3n5"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -73981,8 +74047,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.16.1"; - sha256 = "0yvc23x49ajc0mzcxcsxkx3gyqx3jivlhcsh8898c9wf1rqkwb51"; + version = "3.17"; + sha256 = "1z4d6ryg1i47w7cj4awm9iml2fg4bsjfdxmw6zx9i8fbwifz27rs"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-theorem data-reify mtl @@ -74000,8 +74066,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.16.1"; - sha256 = "05admi6aiz96ly898wgpzxfp21h8s7q1x2fy2hb3ya5a1z6vz6r3"; + version = "3.17"; + sha256 = "1ma1yz0n2437y1yzmy9xa77y1739q6jh2203wbmdpk844yac4ki2"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -74014,8 +74080,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.16.1"; - sha256 = "1gacx9j3ngsv590qqx35la0n2y58898qki4hr3ynj4l63b7566m4"; + version = "3.17"; + sha256 = "1mafaidkcw1a0726drkwn6w6vvw3sxyjpg9d9hdxbqszva1hr1nw"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -74045,8 +74111,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.16.1"; - sha256 = "0j8pvc0w512cnh8af3vkcdf651nbz2g84frccam24aiy38ikvnmp"; + version = "3.17"; + sha256 = "1541x96dkdndc0v2g50h27bg887bx4lxdpq8gh5sd878laqm785m"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -74793,6 +74859,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "cozo-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, libcozo_c, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "cozo-hs"; + version = "0.1.0.0"; + sha256 = "02ylbrqcqji0mz657iia7fx7vxri20ifmhywf9fihsdrx44yrd0g"; + libraryHaskellDepends = [ aeson base bytestring text ]; + libraryPkgconfigDepends = [ libcozo_c ]; + testHaskellDepends = [ + aeson base bytestring tasty tasty-hunit text + ]; + description = "Haskell bindings to the CozoDB C API"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libcozo_c = null;}; + "cparsing" = callPackage ({ mkDerivation, base, containers, directory, either, filepath , HUnit, lens, mtl, parsec, split, template-haskell, transformers @@ -74842,8 +74927,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.7"; - sha256 = "17rr2cffn5ncpiskicgrmg1w7d0axgavf86336ij05fvvc3gzpgi"; + version = "0.2.5.8"; + sha256 = "1ghc5ga4nn0hhr12ig90nbh2g8igqln6n6n9nyv2m8z5kvc16rw1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74985,8 +75070,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.2"; - sha256 = "0yrrrwm69j3k0fwcdrhdzq49zin4jqn5xcl603dr9zfaxfrjw4js"; + version = "4.4.3"; + sha256 = "0pkxwpkiaj4aydifj45wqbhqzqrm92sspgc7m4j1dlxdsj6sbl6h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -76217,8 +76302,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "9"; - editedCabalFile = "0039frsfxhs50rnixiq8kmfw91ar9qigmkzz0wrpds6xvr47ri53"; + revision = "10"; + editedCabalFile = "138wc2zxb9bfprp9z76xij8jxcc4539bs1kka6n6s8x1y8j52g7n"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -76969,15 +77054,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_0_33" = callPackage + "crypton_0_34" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "0.33"; - sha256 = "0805ws7yadwyscr1cm8nh56sj7yk0mplk7yz0n919ziabjks0vz6"; + version = "0.34"; + sha256 = "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -77994,8 +78079,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "1"; - editedCabalFile = "14w4r8y871fkvvak9lklncchlnq3cb6gy4qy1124g9hsnf75mgg4"; + revision = "2"; + editedCabalFile = "0qri8cm9spcpc0g782b0liq9bv350n6cgblnni2dr3q8m6jvkfxx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -78311,8 +78396,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.3.0"; - sha256 = "15mzhygmsa7581lgrz5hyd8lsj5fdrlnbd7zzs7f9ksmdr5sxdzy"; + version = "0.3.1"; + sha256 = "0kw2xsiyrpi2qg5fhb2zl7b593qksqpkmb3j28wf39xm7k2gw1m0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78910,20 +78995,21 @@ self: { "dahdit" = callPackage ({ mkDerivation, base, bytestring, containers, data-default - , data-sword, free, mtl, primitive, tasty, tasty-hunit - , transformers, vector + , data-sword, falsify, free, ghc-typelits-knownnat, mtl, primitive + , tasty, tasty-hunit, text, transformers, vector }: mkDerivation { pname = "dahdit"; - version = "0.3.0"; - sha256 = "0c95v3n7x7z6jgppd8l9x8xqhx6nqx34j66q52k746b0aam5wf2i"; + version = "0.5.0"; + sha256 = "15w57xbiqdcyl51g4lcvwknhn8qwmpcipjgg7zkf44hi12dq77qj"; libraryHaskellDepends = [ - base bytestring containers data-default data-sword free mtl - primitive transformers vector + base bytestring containers data-default data-sword free + ghc-typelits-knownnat mtl primitive text transformers vector ]; testHaskellDepends = [ - base bytestring containers data-default data-sword free mtl - primitive tasty tasty-hunit transformers vector + base bytestring containers data-default data-sword falsify free + ghc-typelits-knownnat mtl primitive tasty tasty-hunit text + transformers vector ]; description = "Binary parsing and serialization with integrated size"; license = lib.licenses.bsd3; @@ -78931,6 +79017,46 @@ self: { broken = true; }) {}; + "dahdit-network" = callPackage + ({ mkDerivation, async, base, bytestring, dahdit, network + , resourcet, stm, tasty, tasty-hunit, unliftio-core + }: + mkDerivation { + pname = "dahdit-network"; + version = "0.5.0"; + sha256 = "0f732x98bv0n39j4dvgyiac4vv37pi7fp6fasjrpgqmpzlq4ww18"; + libraryHaskellDepends = [ + base bytestring dahdit network resourcet unliftio-core + ]; + testHaskellDepends = [ + async base bytestring dahdit network resourcet stm tasty + tasty-hunit unliftio-core + ]; + description = "Network protocol helpers for Dahdit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "dahdit-test" = callPackage + ({ mkDerivation, base, bytestring, containers, dahdit, daytripper + , directory, falsify, tasty, text + }: + mkDerivation { + pname = "dahdit-test"; + version = "0.5.0"; + sha256 = "0hvdicx4m339i1hfzvbjpgnhkcv223ci9m2iggrccx3wv96hxgbl"; + libraryHaskellDepends = [ + base bytestring containers dahdit daytripper directory falsify text + ]; + testHaskellDepends = [ + base bytestring containers dahdit daytripper directory falsify + tasty text + ]; + description = "Test utils for Dahdit serde"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "daino" = callPackage ({ mkDerivation, base, data-default-class, deepseq, dir-traverse , filepath, pandoc, pandoc-sidenote, path, path-io, ReplaceUmlaut @@ -80482,8 +80608,8 @@ self: { pname = "data-functor-logistic"; version = "0.0"; sha256 = "0k2r4jpm7sa3hgd6i08sg9xbgjzkgzx44z5ai5zpw32b7pqr9xqm"; - revision = "1"; - editedCabalFile = "135950pg0gxqhzmvzq9lmvvy5qnsd3q8963fslasgj01bixb3k0f"; + revision = "2"; + editedCabalFile = "0477ky1j44cval3f9nnakz946haxs4477rzbl0i3asc4qwkpi2xl"; libraryHaskellDepends = [ base distributive ]; description = "Updatable analogue of Distributive functors"; license = lib.licenses.bsd3; @@ -81941,8 +82067,8 @@ self: { }: mkDerivation { pname = "daytripper"; - version = "0.2.1"; - sha256 = "15bx4hla164cv328hv26fghpwjay3h96flfl7yajcfs9vfyamjyq"; + version = "0.3.0"; + sha256 = "0m5xhr7rngkxl4n1rzwh6fq192mk0c63css72xirjrm0hhpp9jwl"; libraryHaskellDepends = [ base bytestring directory falsify optparse-applicative tagged tasty tasty-hunit @@ -83026,8 +83152,8 @@ self: { pname = "dec"; version = "0.0.5"; sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; - revision = "1"; - editedCabalFile = "1vng67drg2y9vjg6106q4lcz0kf2f2kl4qrrnl76kmk6z9a9kakh"; + revision = "2"; + editedCabalFile = "1vdnjlhbvh140ml0z4r2w5hl4x4c3fa0cnw68fl65l2mqld44i0h"; libraryHaskellDepends = [ base boring ]; description = "Decidable propositions"; license = lib.licenses.bsd3; @@ -83193,17 +83319,12 @@ self: { }) {}; "deep-map" = callPackage - ({ mkDerivation, base, containers, hedgehog, indexed-traversable - , text, time, time-compat - }: + ({ mkDerivation, base, containers, indexed-traversable }: mkDerivation { pname = "deep-map"; - version = "0.1.1.0"; - sha256 = "0hb5wvdmjbxpa92p2zjxvnx1fxwq3gmalm18k6zkwyamk2isyb33"; + version = "0.2.0"; + sha256 = "1qbrhmwd3r7767nqcvmlkl44g852xyh4yaspcym1d5jxpbzgcbpy"; libraryHaskellDepends = [ base containers indexed-traversable ]; - testHaskellDepends = [ - base containers hedgehog text time time-compat - ]; description = "Deeply-nested, multiple key type maps"; license = lib.licenses.bsd3; }) {}; @@ -83214,8 +83335,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.2.1.2"; - sha256 = "0g4544w9x2djwl3r7nl7lvg5w36hlzh2r7q3xahxs3wc4yyn4q7z"; + version = "0.2.2"; + sha256 = "1sjqvpbb3b90fpxmj0i7zarkj97m6q259l77kgdzjlbcnnd980ws"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base generic-lens rank2classes template-haskell transformers @@ -83778,6 +83899,30 @@ self: { broken = true; }) {}; + "demangler" = callPackage + ({ mkDerivation, base, containers, hspec, lens, prettyprinter + , process, sayable, tasty, tasty-hspec, template-haskell, text + , transformers + }: + mkDerivation { + pname = "demangler"; + version = "1.2.0.0"; + sha256 = "1pv4qhmn5hmksrv868f2mdln938hin917s856xmfpmlnc9zgp6ml"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens sayable template-haskell text + ]; + executableHaskellDepends = [ base sayable text transformers ]; + testHaskellDepends = [ + base hspec prettyprinter process sayable tasty tasty-hspec text + transformers + ]; + description = "Demangler for C++ mangled names"; + license = lib.licenses.bsd3; + mainProgram = "demangle"; + }) {}; + "demarcate" = callPackage ({ mkDerivation, base, free, hspec, transformers }: mkDerivation { @@ -84308,6 +84453,21 @@ self: { license = lib.licenses.mit; }) {}; + "deque_0_4_4_1" = callPackage + ({ mkDerivation, base, deepseq, hashable, mtl, rerebase + , strict-list, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "deque"; + version = "0.4.4.1"; + sha256 = "0gyyhkjmz2m4n1wmg3gd13vxwqg2lgf7fh5cnfnypzjbaag5yxys"; + libraryHaskellDepends = [ base deepseq hashable mtl strict-list ]; + testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; + description = "Double-ended queues"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -84822,8 +84982,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.3.2.0"; - sha256 = "0xl8bib8wsnf8ylmmpln25fnw48zq0js7r9blb0km6sskwdvx6kw"; + version = "0.4.0.0"; + sha256 = "1h3qrswrlpfd0f6h3fknx47zpii5w1mq026yad5ym3ryp3xs2591"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory modern-uri network random text unix @@ -85340,7 +85500,7 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; - "dhall_1_42_0" = callPackage + "dhall_1_42_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg , cborg-json, containers, contravariant, cryptohash-sha256 @@ -85355,14 +85515,13 @@ self: { , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit , tasty-quickcheck, tasty-silver, template-haskell, temporary, text , text-manipulate, text-short, th-lift-instances, time - , transformers, turtle, unix-compat, unordered-containers, vector + , transformers, turtle, unix, unix-compat, unordered-containers + , vector }: mkDerivation { pname = "dhall"; - version = "1.42.0"; - sha256 = "0yykf7va25pqf3pxm4zx3jsjsvdxy9q6dmzxdwhbag31h8isif4w"; - revision = "2"; - editedCabalFile = "06p5paqqzgrbymagkvj8jr983g08qg004f73y63x8ar6xmgaldsw"; + version = "1.42.1"; + sha256 = "0n4773s7l9sfqi00fnh4h92mpifbh0m6vsvpghg834c0jx2gm36f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85376,7 +85535,7 @@ self: { optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; executableHaskellDepends = [ @@ -85388,7 +85547,7 @@ self: { network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; testHaskellDepends = [ @@ -85403,8 +85562,8 @@ self: { quickcheck-instances repline scientific serialise special-values spoon tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-silver template-haskell temporary text text-manipulate - text-short th-lift-instances time transformers turtle unix-compat - unordered-containers vector + text-short th-lift-instances time transformers turtle unix + unix-compat unordered-containers vector ]; benchmarkHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base @@ -85415,7 +85574,7 @@ self: { network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; doCheck = false; @@ -86140,22 +86299,6 @@ self: { }) {}; "di-monad" = callPackage - ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes - , stm, streaming, transformers, unliftio-core - }: - mkDerivation { - pname = "di-monad"; - version = "1.3.2"; - sha256 = "1j8s44kg2r5s59vjy7g8d7pg14nkafpdsg4xn17p3v26jyfzcsmh"; - libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm streaming - transformers unliftio-core - ]; - description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = lib.licenses.bsd3; - }) {}; - - "di-monad_1_3_5" = callPackage ({ mkDerivation, base, conduit, containers, di-core, exceptions , monad-control, mtl, pipes, pipes-safe, primitive, resourcet, stm , streaming, transformers, transformers-base, unliftio-core @@ -86171,7 +86314,6 @@ self: { ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "di-polysemy" = callPackage @@ -87508,8 +87650,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.12"; - sha256 = "1z765d5rsz3gh0rq8601gq5fhzm3yvk175vchw9qnanv7zn596wx"; + version = "0.15"; + sha256 = "1j8f9kq51lszzdfh9xdngjpxwcqnbkg5d4xa2ljzp7hd7xqnwnai"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -89702,6 +89844,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.3"; sha256 = "0iypfrnjj9qaiv1xicr310jcham5kym4yr6myy6vbi8nbgwl82kp"; + revision = "1"; + editedCabalFile = "10fjp19b7kpfavsaxpfpq479yfki6s2y7s5791w3yawpnlbj7g3v"; libraryHaskellDepends = [ base deepseq dlist foldable1-classes-compat semigroupoids ]; @@ -90737,34 +90881,6 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.3.0.1"; - sha256 = "17azfkx2hl48gfxhln710lngzbcwfmxv24jqj8h59ydrah9cba11"; - revision = "1"; - editedCabalFile = "0n2kfbqkbxb8mshvxlsc9kg7klgdp9i0raq56x15vdif8sji82qw"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions filepath ghc ghc-paths Glob process random syb - template-haskell transformers unordered-containers - ]; - testHaskellDepends = [ - base base-compat code-page containers deepseq directory exceptions - filepath ghc ghc-paths hspec hspec-core HUnit mockery process - QuickCheck setenv silently stringbuilder syb transformers - ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - }) {}; - - "doctest-parallel_0_3_1" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob - , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random - , setenv, silently, stringbuilder, syb, template-haskell - , transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; version = "0.3.1"; sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; libraryHaskellDepends = [ @@ -90780,7 +90896,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -92692,6 +92807,20 @@ self: { license = lib.licenses.publicDomain; }) {}; + "duckdb-haskell" = callPackage + ({ mkDerivation, base, mtl, system-cxx-std-lib, tasty, tasty-hunit + , vector + }: + mkDerivation { + pname = "duckdb-haskell"; + version = "0.1.0.0"; + sha256 = "0q1p4zx8ccz800938mi7z96agvffmw07wsi8ac3ii9h74jcx6lb0"; + libraryHaskellDepends = [ base mtl system-cxx-std-lib ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; + description = "Haskell bindings for duckdb"; + license = lib.licenses.mit; + }) {}; + "duckling" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, bytestring , containers, deepseq, dependent-sum, directory, extra, filepath @@ -92831,6 +92960,26 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_12_0" = callPackage + ({ mkDerivation, base, criterion, filepath, MonadRandom + , simple-affine-space, tasty, tasty-hunit, time, transformers + , transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.12.0"; + sha256 = "019332zb3c6abwxpw6qxd6pr0v379aadgd9p9li2la7x8a8qmc00"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + benchmarkHaskellDepends = [ base criterion filepath time ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -92851,8 +93000,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.11.2"; - sha256 = "18f45db2n45khn2vxs1wpqsyapy6iivbmv86snx1d0hd2f9bfmx1"; + version = "0.12.0"; + sha256 = "0wzzkqky1bn5kvr23wwax7p7hklal1b80hdy627wr6h39czia391"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -94233,7 +94382,9 @@ self: { pretty-simple text time unordered-containers vector ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hectare"; + broken = true; }) {}; "ecta-plugin" = callPackage @@ -94277,8 +94428,8 @@ self: { pname = "ed25519"; version = "0.0.5.0"; sha256 = "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"; - revision = "7"; - editedCabalFile = "0gpp3v411c76r282466xb24j87jyl3n7xypkxsjqprmr31y4vc1x"; + revision = "8"; + editedCabalFile = "0x8wx1mp6lf9cgz0p326m76p181r14fyxwwq8iicrx8sha4kff28"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck @@ -96607,7 +96758,7 @@ self: { license = lib.licenses.asl20; }) {}; - "emacs-module_0_2" = callPackage + "emacs-module_0_2_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, filepath , monad-control, monad-interleave, mtl, prettyprinter , prettyprinter-combinators, primitive, template-haskell, text @@ -96615,8 +96766,8 @@ self: { }: mkDerivation { pname = "emacs-module"; - version = "0.2"; - sha256 = "1jrc031zgd418jfdfp9mgbc8vvdij5rfq0255va5mk1a1xfzyis4"; + version = "0.2.1"; + sha256 = "0xmydwd9b78943cqxwx3pk71lp9chr879rpkf2fhfl2g6xvhrf86"; libraryHaskellDepends = [ base bytestring deepseq exceptions filepath monad-control monad-interleave mtl prettyprinter prettyprinter-combinators @@ -97095,8 +97246,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.8"; - sha256 = "13b73zv9g2m2qriwjccf44bx5jywnqv72fjkhg89zv22ncgsf1fh"; + version = "0.8.9"; + sha256 = "0czqdh5bkbp1hy1kwhhmiqml5fr4n6iv0bk84slj6ym9ryrjdrf8"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -98812,8 +98963,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.10.3"; - sha256 = "0amvg1857gnqi4g8x3dcig3l1mfvqxsfm4l61kjixbfb7zfksn0i"; + version = "3.5.11.0"; + sha256 = "03vk49q87m85qkld89d1gxf17mah7xkhk0m5y84d4mv1c5is530y"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -101171,8 +101322,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "1.6.0.1"; - sha256 = "0r26dvc4dc865x84pz8y4yh43pzzgdy524aggwn3q2m3frdc7zba"; + version = "1.6.0.2"; + sha256 = "17hq0ywafh72cskqh7mbfbq6lgc4j3szvfnz4sf6m84llzzvbdv9"; libraryHaskellDepends = [ base ghc incipit-base parsec template-haskell ]; @@ -102726,8 +102877,8 @@ self: { }: mkDerivation { pname = "falsify"; - version = "0.1.1"; - sha256 = "0srhrrx6iw6d8zc0ikikdg1j8yd6x845ja0z5sj340gxr1nvyq3h"; + version = "0.2.0"; + sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -104035,8 +104186,8 @@ self: { }: mkDerivation { pname = "fedora-repoquery"; - version = "0.2"; - sha256 = "1vbjwz98bmax8l535ip2n2500y431n87rf0p5gx8bff7qv68l3j6"; + version = "0.3"; + sha256 = "020jsrlhb4dfn4kjkzxm8ix72m3c9ihsr85h23nf1f1kdv15cinv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105092,8 +105243,8 @@ self: { pname = "file-embed-lzma"; version = "0.0.1"; sha256 = "19l1gdjhsn4zh96mzbjsa5rn0acwrx1w3jy25cm23xv6jl8z28i9"; - revision = "1"; - editedCabalFile = "1zhbka04bbb7y1bslnxf8p145dwc48m3jmk5gighky8smjrzjjzr"; + revision = "2"; + editedCabalFile = "1l1gkqljzm8v35in335rxzc548x06qdis6617gpl09lv81c7k12l"; libraryHaskellDepends = [ base bytestring directory filepath lzma template-haskell text transformers @@ -105589,8 +105740,8 @@ self: { pname = "fin"; version = "0.3"; sha256 = "0dqwwd940pws4dpcaimbzxvxj7crncdcnslvjl2npa69x5vh63g2"; - revision = "1"; - editedCabalFile = "14f3mg6hjwy8yycrkj8p925kwb6hjzy2hm6yb4fwl243w92yf5qa"; + revision = "2"; + editedCabalFile = "1b5icwiklwf6rxgbx88yg6hhcnzm8697jcd64nhk048dyiyw19df"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -105898,8 +106049,8 @@ self: { }: mkDerivation { pname = "finite-fields"; - version = "0.2"; - sha256 = "158qc6q8ppisjxhipcvfjha8iklg0x6jpf0cb8wgsz2456wzm2s8"; + version = "0.2.0.1"; + sha256 = "0rn5c0dsxx07y37zy5ckhr4q6s2hg56skfbj00cizrxch3z7r54y"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base containers random vector ]; testHaskellDepends = [ @@ -105911,6 +106062,20 @@ self: { broken = true; }) {}; + "finite-semigroups" = callPackage + ({ mkDerivation, base, containers, HUnit, safe }: + mkDerivation { + pname = "finite-semigroups"; + version = "0.1.0.0"; + sha256 = "0xvqnafhqhv17jr0pl9r4fxj5rcp8q18pymmbckrq1dc7hffdqq2"; + revision = "1"; + editedCabalFile = "1hb2f392007ks1vcvhs6rd82piwmbz5n0v477lv9kja2ww90i4y5"; + libraryHaskellDepends = [ base containers safe ]; + testHaskellDepends = [ base containers HUnit ]; + description = "Operations and classification for finite semigroups"; + license = lib.licenses.mit; + }) {}; + "finite-table" = callPackage ({ mkDerivation, adjunctions, base, cereal, data-default-class , deepseq, distributive, fin-int, indexed-traversable, lens @@ -106473,6 +106638,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-vector_1_2_3_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "1.2.3.0"; + sha256 = "0cbz734dccsy3jvhszszyrnls6bbys4gaq326dksaabwv6mn58vc"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -106765,23 +106943,20 @@ self: { "flac" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, flac, hspec, hspec-discover, mtl, temporary - , text, transformers, vector, wave + , text, vector, wave }: mkDerivation { pname = "flac"; - version = "0.2.0"; - sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; - revision = "4"; - editedCabalFile = "0vgc21i3srxq6is8c05qghrz71nmv3mlvcy3aincsvsgib852kk3"; + version = "0.2.1"; + sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text - transformers vector wave + vector wave ]; librarySystemDepends = [ flac ]; testHaskellDepends = [ - base bytestring directory filepath hspec temporary transformers - vector wave + base bytestring directory filepath hspec temporary vector wave ]; testToolDepends = [ hspec-discover ]; description = "Complete high-level binding to libFLAC"; @@ -107522,6 +107697,19 @@ self: { license = lib.licenses.mit; }) {}; + "flow_2_0_0_4" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "flow"; + version = "2.0.0.4"; + sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Write more understandable Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -108150,26 +108338,12 @@ self: { }: mkDerivation { pname = "focus"; - version = "1.0.3.1"; - sha256 = "164hg9n1mwx0kpil4hqcw2l2y4c1zj52vkygsbffv5yr9cmwwc9x"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ rerebase tasty tasty-hunit ]; - description = "A general abstraction for manipulating elements of container data structures"; - license = lib.licenses.mit; - }) {}; - - "focus_1_0_3_2" = callPackage - ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "focus"; version = "1.0.3.2"; sha256 = "11n2dh0ilc2hqh96ivy1k2y3pi8y1ll11awp4r3h40w17023yjz2"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ rerebase tasty tasty-hunit ]; description = "A general abstraction for manipulating elements of container data structures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "focuslist" = callPackage @@ -108296,6 +108470,8 @@ self: { pname = "foldl"; version = "1.4.15"; sha256 = "1bn00vv60kfwqcn1xv4yi5k2dm8kdksai034wv3cp20p2h2z3clw"; + revision = "1"; + editedCabalFile = "1qgydj1q78bxx59ad62jw19iikr8nkq74rzr9mfpk3vpiw0v7lk5"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -108741,8 +108917,8 @@ self: { }: mkDerivation { pname = "foreign"; - version = "0.2.0.1"; - sha256 = "0jdp0firbgjsgfzwsxw2yr9lj08bibhngcfwamj0sh3asrb6ryws"; + version = "0.2.1.0"; + sha256 = "0xgxw4yik1dw6r6zp3w50wazpglvwxvgyxhgj01sfkh275nfh7yw"; libraryHaskellDepends = [ base bytestring ghc-prim primitive primitive-unlifted ]; @@ -108898,8 +109074,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "1"; - editedCabalFile = "12336x0g41hp6brl4ynw0m32kj3n191945qfgp8xaabm5qrchinj"; + revision = "2"; + editedCabalFile = "1wm2zqhdzx5qawlqm74kpfivfhp3bmlagxc63xz7vm4pr17cisyq"; libraryHaskellDepends = [ aeson base containers mtl text ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; @@ -109496,6 +109672,41 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_14_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.14.1.0"; + sha256 = "1wqrs5fl72br5mlkf1dyna0946kxscjfgb4956mksr2fgcdqmdxl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fp-ieee" = callPackage ({ mkDerivation, base, doctest, ghc-bignum, hspec, hspec-core , integer-logarithms, QuickCheck, random, tasty-bench @@ -109890,8 +110101,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.10.2.0"; - sha256 = "18d8594pz123kbhvw3igazs5ngd8rrs050ivb1hmksr6x2r6b6mm"; + version = "1.10.4.0"; + sha256 = "113nkqv47v2fkn6dpvx6dl58192jsr79c9yc8bfqjkxkbqg72py1"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit @@ -111240,18 +111451,18 @@ self: { }) {}; "fswatcher" = callPackage - ({ mkDerivation, base, directory, fsnotify, optparse-applicative - , process, regex-pcre-builtin, system-filepath, unix + ({ mkDerivation, base, directory, filepath, fsnotify + , optparse-applicative, process, regex-pcre-builtin, unix }: mkDerivation { pname = "fswatcher"; - version = "0.3.0"; - sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f"; + version = "0.4.0"; + sha256 = "1gqfdr1ad2ag0hdhdi2qyz6vji93zyrb6sv2kjhfizbwacqh8gbd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory fsnotify optparse-applicative process - regex-pcre-builtin system-filepath unix + base directory filepath fsnotify optparse-applicative process + regex-pcre-builtin unix ]; description = "Watch a file/directory and run a command when it's modified"; license = lib.licenses.bsd3; @@ -111774,8 +111985,8 @@ self: { pname = "functor-classes-compat"; version = "2.0.0.2"; sha256 = "02jamibwyr8hvf432m761v94xmwhbflrp6hd01jyv7fm95f5ki6h"; - revision = "2"; - editedCabalFile = "1vzh1hwg815pv64nbv8hvwbb91qg0fbq2xkdrn0d1m6li2h5k6q7"; + revision = "3"; + editedCabalFile = "0lkp1rggfhx8n3925f2iaxm8iznl2vb24m9b974nzid6565gx96k"; libraryHaskellDepends = [ base containers ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; @@ -112279,6 +112490,23 @@ self: { license = lib.licenses.asl20; }) {}; + "fusion-plugin_0_2_7" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: + mkDerivation { + pname = "fusion-plugin"; + version = "0.2.7"; + sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; + description = "GHC plugin to make stream fusion more predictable"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fusion-plugin-types" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -112306,8 +112534,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.5"; - sha256 = "1jikcawlhx0529dvdikz52qyb3q1hp1avagzdmgdggj5yik9wc38"; + version = "0.25.7"; + sha256 = "1dj0xyk83kkb7zay23rqy92kkmq0rqiyrm3nhw246mhf7swn1rkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117482,8 +117710,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-parser"; - version = "0.2.5.0"; - sha256 = "17ms9zyh5mczqpxhs2p2y3sa4zda39lzl66dkb18a79c5p36id0r"; + version = "0.2.6.0"; + sha256 = "177glyhd9qr4z19zl8ycdy2302k8jzyhrkh14dp92dp86iydlxp6"; libraryHaskellDepends = [ base ghc ]; description = "Haskell source parser from GHC"; license = lib.licenses.mit; @@ -117819,6 +118047,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_10_0" = callPackage + ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.10.0"; + sha256 = "145xjyraqd62k5amyqi9028rr9v2lgz3irmgz5v2hppza1i5qy72"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc-lib-parser text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using the lexer of GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-syntax-highlighter_0_0_11_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: @@ -120344,13 +120588,18 @@ self: { }) {}; "gigaparsec" = callPackage - ({ mkDerivation, base, containers, selective, tasty, tasty-hunit }: + ({ mkDerivation, base, containers, deepseq, gauge, selective, tasty + , tasty-expected-failure, tasty-hunit + }: mkDerivation { pname = "gigaparsec"; - version = "0.1.0.0"; - sha256 = "177y3rnsg4zy94j2snpcnqdq754b33ni7m07fs7srbyarpm6kd21"; + version = "0.2.0.0"; + sha256 = "0x2chdfcnc914dbjjgyxkjnwanmmdl9p0a6pfsnyncv6j1x6bcsz"; libraryHaskellDepends = [ base containers selective ]; - testHaskellDepends = [ base containers tasty tasty-hunit ]; + testHaskellDepends = [ + base containers tasty tasty-expected-failure tasty-hunit + ]; + benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Refreshed parsec-style library for compatiblity with Scala parsley"; license = lib.licenses.bsd3; }) {}; @@ -121306,6 +121555,31 @@ self: { mainProgram = "github-release"; }) {}; + "github-release_2_0_0_9" = callPackage + ({ mkDerivation, aeson, base, burrito, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers + }: + mkDerivation { + pname = "github-release"; + version = "2.0.0.9"; + sha256 = "0lhaz92jr6ssl1mq5nmcwv6n43wda6mjv2qdzm8rg5275xqpa7jv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + executableHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + description = "Upload files to GitHub releases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "github-release"; + }) {}; + "github-rest" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty @@ -121544,31 +121818,6 @@ self: { "gitlab-haskell" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring - , connection, http-client, http-conduit, http-types, tasty - , tasty-hunit, temporary, text, time, transformers, tree-diff, unix - , unordered-containers, vector - }: - mkDerivation { - pname = "gitlab-haskell"; - version = "1.0.0.1"; - sha256 = "1spd989dpqjx7m39fdzdkirp3pgh5cf57dqv756x51r4qkcs4hh1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring connection http-client http-conduit - http-types temporary text time transformers unix - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring tasty tasty-hunit tree-diff - unordered-containers vector - ]; - description = "A Haskell library for the GitLab web API"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "gitlab-haskell_1_0_0_3" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring , connection, http-client, http-conduit, http-types, mtl, tasty , tasty-hunit, temporary, text, time, transformers, tree-diff, unix , unordered-containers, vector @@ -125651,8 +125900,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "4"; - editedCabalFile = "03jfrffs2ip7i4qqxhy8cjynygnaahpw1z19xg4j2fh32h669i53"; + revision = "5"; + editedCabalFile = "1nd5li3w3brca187j40mcx1dgd02fs5snj7pf21ib23qcznfnh1n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125803,6 +126052,7 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -125937,6 +126187,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -131383,8 +131635,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "2"; - editedCabalFile = "04hvk5q2x8j75z1yknfxa1607hwb8xx4k5bgdq8qmw2a5zkb5fyy"; + revision = "3"; + editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -132593,10 +132845,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "halfsplit"; - version = "0.3.0.0"; - sha256 = "0yxi29jai57jgvw67c305lcmnyyh58a8pjz1yvmbmk5q20cmbkdc"; + version = "0.4.1.0"; + sha256 = "0mas6a53p44cnfzb26lpsrpgy1zh7vm5i2lxk0invmf35sbaq0w9"; libraryHaskellDepends = [ base ]; - description = "A library to provide special kind of two-column terminal output for Phladiprelio"; + description = "A library to provide special kind of two-column output for Phladiprelio"; license = lib.licenses.mit; }) {}; @@ -133929,6 +134181,8 @@ self: { pname = "happstack-server"; version = "7.8.0.2"; sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; + revision = "1"; + editedCabalFile = "088n68k51jya68drknmywm60f22igrpidh2dmyj74mfp554jfhg2"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -136949,7 +137203,9 @@ self: { description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "haskell-snake"; + broken = true; }) {}; "haskell-spacegoo" = callPackage @@ -139706,34 +139962,6 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, network-ip - , postgresql-binary, postgresql-libpq, profunctors, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, time, transformers, uuid - , vector - }: - mkDerivation { - pname = "hasql"; - version = "1.6.3.2"; - sha256 = "0b5sawrcbyqin48vfg2nyrk55qdsxpdn4gmdj3mdb30vnrkns9pq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-strict-builder - contravariant dlist hashable hashtables mtl network-ip - postgresql-binary postgresql-libpq profunctors scientific text - text-builder time transformers uuid vector - ]; - testHaskellDepends = [ - contravariant-extras QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ gauge rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - }) {}; - - "hasql_1_6_3_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, network-ip , postgresql-binary, postgresql-libpq, profunctors , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers, uuid @@ -139756,7 +139984,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -141040,8 +141267,8 @@ self: { pname = "haxr"; version = "3000.11.5"; sha256 = "1n2q7r0a6c24xbvdnl7ql5cc25sbbalmdc75rmlpazhkazq8jy99"; - revision = "1"; - editedCabalFile = "01sswar7mybdjl7ry5acwslg30kh1cjv7lxbyvav1cv0d9irkjv6"; + revision = "2"; + editedCabalFile = "0nra68lczd019nxcgdxh82k6h846dwjd14k9ql1ngh6g35sq9hdq"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -141457,12 +141684,17 @@ self: { }) {}; "hcdt" = callPackage - ({ mkDerivation, base, containers, indexed-traversable }: + ({ mkDerivation, base, containers, hashable, indexed-traversable + , system-cxx-std-lib, witherable + }: mkDerivation { pname = "hcdt"; - version = "0.1.0.5"; - sha256 = "18hd8x7g615cgafgni27x914kqvashdicd1alaj02mha4jl0380a"; - libraryHaskellDepends = [ base containers indexed-traversable ]; + version = "0.1.1.1"; + sha256 = "1kjy5mn1rrz9dbx0cs8f6y8n3bf7sc1nyz70k2bcm9sv8sxhabq4"; + libraryHaskellDepends = [ + base containers hashable indexed-traversable system-cxx-std-lib + witherable + ]; description = "2d Delaunay triangulation"; license = lib.licenses.bsd3; }) {}; @@ -143240,21 +143472,20 @@ self: { }) {}; "hegg" = callPackage - ({ mkDerivation, base, containers, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, transformers + ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "hegg"; - version = "0.4.0.0"; - sha256 = "1nhxmf90965752skn3wcyjavi2amfxhlyrh60lmslm08w2wk14sk"; - revision = "1"; - editedCabalFile = "11c6ls164lr2bwjk0bbkzy8wiaazi8gd60pqyhf0in376ar2f6z5"; + version = "0.5.0.0"; + sha256 = "0xwxmkkvx0aj8h2vqxv3n1vi94sp1kyh02yrh3mwr24d7xjq1qzs"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ - base containers tasty tasty-bench tasty-hunit tasty-quickcheck + base containers deepseq tasty tasty-bench tasty-hunit + tasty-quickcheck ]; description = "Fast equality saturation in Haskell"; license = lib.licenses.bsd3; @@ -143320,10 +143551,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.1.1.1"; - sha256 = "0s6ydncib0g4mdmx4vzwmp1cnbvxrb2pngvkd5jc5kn5vb3g929l"; - revision = "3"; - editedCabalFile = "0lqh0qjphsfv65k8jgjrgnfln7c7wh8gqzmn9qa8s5m4viz6fkqs"; + version = "1.1.1.2"; + sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -144585,15 +144814,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "hetzner_0_5_0_0" = callPackage + "hetzner_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, country, directory, http-conduit, ip, megaparsec , scientific, text, time, yaml }: mkDerivation { pname = "hetzner"; - version = "0.5.0.0"; - sha256 = "0xrmbjv52w0gzdfvkgc6mxmq7887qsywz2xb8yrls1szw938x6q8"; + version = "0.6.0.0"; + sha256 = "1p8sxknssdjxr7bszxcld8rk40hm70cm58qkimjs5adz2hrimn14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144627,43 +144856,44 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, aeson-optics, ansi-wl-pprint - , array, async, base, base16, binary, brick, bytestring, cereal - , containers, cryptonite, data-dword, Decimal, deepseq, directory - , filemanip, filepath, filepattern, free, githash, gmp, haskeline - , here, HUnit, libff, megaparsec, memory, monad-par, mtl, multiset - , operational, optics-core, optics-extra, optics-th - , optparse-generic, process, QuickCheck, quickcheck-instances + ({ mkDerivation, abstract-par, aeson, aeson-optics, array, async + , base, base16, binary, brick, bytestring, cereal, containers + , cryptonite, data-dword, Decimal, deepseq, directory, filemanip + , filepath, filepattern, free, githash, gmp, haskeline, here, HUnit + , libff, megaparsec, memory, monad-par, mtl, multiset, operational + , optics-core, optics-extra, optics-th, optparse-generic + , pretty-hex, process, QuickCheck, quickcheck-instances , quickcheck-text, regex, regex-tdfa, restless-git, rosezipper - , scientific, secp256k1, smt2-parser, spawn, spool, stm, tasty - , tasty-bench, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, temporary, text, time, transformers, tree-view - , tuple, unordered-containers, vector, vty, witch, witherable - , word-wrap, wreq + , scientific, secp256k1, smt2-parser, spawn, spool, stm + , system-cxx-std-lib, tasty, tasty-bench, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-view, unordered-containers, vector, vty, witch + , witherable, word-wrap, wreq }: mkDerivation { pname = "hevm"; - version = "0.51.3"; - sha256 = "0cfy72vxihyw12a2b8nqzpqxcwc1r1ssja4j5qk0c68cq6n7djqb"; + version = "0.52.0"; + sha256 = "1l534d084fybklkc69j8c2bmpmsfi5q01rjhq7y4c6699igb72py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - abstract-par aeson aeson-optics ansi-wl-pprint array async base - base16 binary brick bytestring cereal containers cryptonite - data-dword Decimal deepseq directory filemanip filepath filepattern - free haskeline here HUnit megaparsec memory monad-par mtl multiset - operational optics-core optics-extra optics-th optparse-generic + abstract-par aeson aeson-optics array async base base16 binary + brick bytestring cereal containers cryptonite data-dword Decimal + deepseq directory filemanip filepath filepattern free haskeline + here HUnit megaparsec memory monad-par mtl multiset operational + optics-core optics-extra optics-th optparse-generic pretty-hex process QuickCheck quickcheck-instances quickcheck-text regex regex-tdfa restless-git rosezipper scientific smt2-parser spawn - spool stm tasty tasty-bench tasty-expected-failure tasty-hunit - tasty-quickcheck temporary text time transformers tree-view tuple - unordered-containers vector vty witch witherable word-wrap wreq + spool stm system-cxx-std-lib tasty tasty-bench + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time transformers tree-view unordered-containers vector vty witch + witherable word-wrap wreq ]; librarySystemDepends = [ gmp libff secp256k1 ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async base base16 binary brick bytestring - containers cryptonite data-dword deepseq directory filepath free - githash memory mtl operational optics-core optparse-generic process + aeson async base base16 binary brick bytestring containers + cryptonite data-dword deepseq directory filepath free githash + memory mtl operational optics-core optparse-generic process QuickCheck quickcheck-text regex-tdfa spawn stm temporary text unordered-containers vector vty witch ]; @@ -144675,13 +144905,12 @@ self: { tasty-expected-failure tasty-hunit tasty-quickcheck temporary text time vector witch witherable ]; - testSystemDepends = [ secp256k1 ]; benchmarkHaskellDepends = [ base bytestring containers filemanip filepath here mtl tasty tasty-bench text ]; doHaddock = false; - description = "Ethereum virtual machine evaluator"; + description = "Symbolic EVM Evaluator"; license = lib.licenses.agpl3Only; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; @@ -145999,6 +146228,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_6_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.6.0"; + sha256 = "1b13lbgmdb50fw3jkbvj2wq19zmklhxam7rfn7k8bqra2z4kbp2r"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio text vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -147185,27 +147433,6 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.9.0.7"; - sha256 = "1pq1va24vnizw79c3k0f432srfplx5lbmndqhhw3xzvxc1m48q96"; - libraryHaskellDepends = [ - base containers directory exceptions filepath ghc ghc-boot - ghc-paths random temporary transformers unix - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath HUnit stm - text typed-process unix - ]; - description = "A Haskell interpreter built on top of the GHC API"; - license = lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random - , stm, temporary, text, transformers, typed-process, unix - }: - mkDerivation { - pname = "hint"; version = "0.9.0.8"; sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; libraryHaskellDepends = [ @@ -147218,7 +147445,6 @@ self: { ]; description = "A Haskell interpreter built on top of the GHC API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hint-server" = callPackage @@ -148141,27 +148367,6 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.4.3.1"; - sha256 = "0ls5g6xm8kyqk9yrwkbxqck8l14ij0zsmkscl6h7cicq3b0ar5vj"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring directory extra filepath simple-cabal - simple-cmd-args simple-prompt typed-process xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3Only; - mainProgram = "hkgr"; - }) {}; - - "hkgr_0_4_3_2" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , simple-cabal, simple-cmd-args, simple-prompt, typed-process - , xdg-basedir - }: - mkDerivation { - pname = "hkgr"; version = "0.4.3.2"; sha256 = "1c87hpd4p4mq3cx5m52c7hkwp18f5klkkfx342q2zmkks97lf1zb"; isLibrary = false; @@ -148173,7 +148378,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hkgr"; }) {}; @@ -151008,7 +151212,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_8_1" = callPackage + "hoauth2_2_9_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, cryptonite, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -151016,14 +151220,14 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.8.1"; - sha256 = "134fvq9aasp3dmwj50wr8y7i3i292q68pr41dapdqq5mx4b77w8r"; + version = "2.9.0"; + sha256 = "1y8nrn4f4029imrxa215hrgv5cysdg7rcg9vwwxanavq1wfvlxfa"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers cryptonite data-default exceptions http-conduit http-types memory microlens text transformers uri-bytestring uri-bytestring-aeson ]; - testHaskellDepends = [ aeson base hspec ]; + testHaskellDepends = [ aeson base hspec uri-bytestring ]; testToolDepends = [ hspec-discover ]; description = "Haskell OAuth2 authentication client"; license = lib.licenses.mit; @@ -151033,22 +151237,21 @@ self: { "hoauth2-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, hoauth2, hoauth2-providers, http-conduit, http-types - , jose-jwt, microlens, mustache, parsec, scotty, text, transformers - , unordered-containers, uri-bytestring, wai, wai-middleware-static - , warp + , jose-jwt, mustache, parsec, scotty, text, transformers + , uri-bytestring, wai, wai-middleware-static, warp }: mkDerivation { pname = "hoauth2-demo"; - version = "1.6.0"; - sha256 = "1ypqbx19f25r1g3msj02h74zndl0bflc1y45gh4hfj3a0rz931gq"; + version = "1.7.0"; + sha256 = "19dnblzibmjzv01sgzbq35bx20d8yqarqyimjqqz9jmmqg368iv9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers data-default directory hoauth2 - hoauth2-providers http-conduit http-types jose-jwt microlens - mustache parsec scotty text transformers unordered-containers - uri-bytestring wai wai-middleware-static warp + hoauth2-providers http-conduit http-types jose-jwt mustache parsec + scotty text transformers uri-bytestring wai wai-middleware-static + warp ]; description = "hoauth2 demo application"; license = lib.licenses.mit; @@ -151058,19 +151261,21 @@ self: { "hoauth2-providers" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite - , data-default, directory, hoauth2, HsOpenSSL, http-conduit - , http-types, jose-jwt, mtl, parsec, text, time, transformers - , unordered-containers, uri-bytestring + , hoauth2, HsOpenSSL, hspec, hspec-discover, http-conduit + , http-types, jose-jwt, mtl, text, time, transformers + , uri-bytestring, uri-bytestring-aeson }: mkDerivation { pname = "hoauth2-providers"; - version = "0.2"; - sha256 = "1d53byy7gfp02dily3xas0aav2a63s32maanl9ba3pbpzlic9lvp"; + version = "0.3.0"; + sha256 = "0g87adfnr528vb2iy9rpc405h7x7j79fqly55d6x9i7dqhz73g7d"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite data-default directory - hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl parsec text - time transformers unordered-containers uri-bytestring + aeson base bytestring containers cryptonite hoauth2 HsOpenSSL + http-conduit http-types jose-jwt mtl text time transformers + uri-bytestring uri-bytestring-aeson ]; + testHaskellDepends = [ aeson base hspec uri-bytestring ]; + testToolDepends = [ hspec-discover ]; description = "OAuth2 Identity Providers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -151078,20 +151283,19 @@ self: { }) {}; "hoauth2-providers-tutorial" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hoauth2 + ({ mkDerivation, base, bytestring, containers, hoauth2 , hoauth2-providers, http-conduit, http-types, scotty, text - , transformers, uri-bytestring, wai, warp + , transformers, uri-bytestring }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.2"; - sha256 = "1xb25d83qq8bmvx89nhzjcak406110j3id44y4ab6rqaccmgl5xf"; + version = "0.3.0"; + sha256 = "125lkxiijc8n480m2rpzgihr4j2cywgnm67zn90l1b8fwfsgm9hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers hoauth2 hoauth2-providers - http-conduit http-types scotty text transformers uri-bytestring wai - warp + base bytestring containers hoauth2 hoauth2-providers http-conduit + http-types scotty text transformers uri-bytestring ]; executableHaskellDepends = [ base ]; description = "tutorial for hoauth2-providers module"; @@ -151101,24 +151305,23 @@ self: { }) {}; "hoauth2-tutorial" = callPackage - ({ mkDerivation, aeson, base, bytestring, hoauth2, http-conduit - , http-types, scotty, text, transformers, uri-bytestring, wai, warp + ({ mkDerivation, aeson, base, bytestring, containers, hoauth2 + , http-conduit, http-types, scotty, text, transformers + , uri-bytestring }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.2"; - sha256 = "18mapdfx6ws3477bm63pcg4nvs1brsh75xc7jy3h4zyn99ci8ipv"; - isLibrary = true; + version = "0.3.0"; + sha256 = "1alnzhmgsijzv466mqbmvcalh100nqbh1pm59774q34kxxnrrjmc"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring hoauth2 http-conduit http-types scotty text - transformers uri-bytestring wai warp + executableHaskellDepends = [ + aeson base bytestring containers hoauth2 http-conduit http-types + scotty text transformers uri-bytestring ]; - executableHaskellDepends = [ base ]; description = "Tutorial for using hoauth2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "hoauth2-tutorial"; broken = true; }) {}; @@ -153366,14 +153569,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_2_0" = callPackage + "hpc-codecov_0_5_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, hpc, process, tasty, tasty-hunit, time + , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.2.0"; - sha256 = "1vfx7x9w72lca9zv489fb5h0jqc50ijmikjij6hkb3flbyskdzqd"; + version = "0.5.0.0"; + sha256 = "1hf73yj2dl5scrw3xqgin8zl555iv2byik88aih1mz5x6635rk55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153381,9 +153584,9 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory filepath process tasty tasty-hunit + base directory filepath hpc process tasty tasty-golden tasty-hunit ]; - description = "Generate codecov report from hpc data"; + description = "Generate reports from hpc data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hpc-codecov"; @@ -153673,6 +153876,36 @@ self: { broken = true; }) {libpq = null;}; + "hpqtypes_1_11_1_2" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, HUnit, libpq, lifted-base, monad-control, mtl + , QuickCheck, random, resource-pool, scientific, semigroups, stm + , test-framework, test-framework-hunit, text, text-show, time + , transformers, transformers-base, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.11.1.2"; + sha256 = "0zdxk11akkl6l260jlywq2fjfv68angqaxdj577m9fk5yllxwswy"; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups stm text text-show time + transformers transformers-base uuid-types vector + ]; + libraryPkgconfigDepends = [ libpq ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers uuid-types vector + ]; + description = "Haskell bindings to libpqtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libpq = null;}; + "hpqtypes-effectful" = callPackage ({ mkDerivation, base, effectful-core, exceptions, hpqtypes , resource-pool, tasty, tasty-hunit, text @@ -154056,25 +154289,6 @@ self: { }: mkDerivation { pname = "hreader"; - version = "1.1.0"; - sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara"; - revision = "1"; - editedCabalFile = "0kz3yzah7m4c2r9yaawhljcgb579masx3lx4mrr4lmqy39kmsvcb"; - libraryHaskellDepends = [ - base exceptions hset mmorph monad-control mtl tagged transformers - transformers-base - ]; - testHaskellDepends = [ base hset transformers-base ]; - description = "Generalization of MonadReader and ReaderT using hset"; - license = lib.licenses.bsd3; - }) {}; - - "hreader_1_1_1" = callPackage - ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl - , tagged, transformers, transformers-base - }: - mkDerivation { - pname = "hreader"; version = "1.1.1"; sha256 = "0am8kyy046l9laqxx60nm3v6haz00wbrs1naxg0yq8z8yqcn4qvv"; libraryHaskellDepends = [ @@ -154084,7 +154298,6 @@ self: { testHaskellDepends = [ base hset transformers-base ]; description = "Generalization of MonadReader and ReaderT using hset"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hreader-lens" = callPackage @@ -154258,6 +154471,28 @@ self: { broken = true; }) {inherit (pkgs) ruby;}; + "hruby_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck + , ruby, scientific, stm, text, unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.5.1.0"; + sha256 = "0m3n1nz1bmm8fpfrq82mhnkrx86adw0m3192smx2rw6iqvzk92hd"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + libraryPkgconfigDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) ruby;}; + "hs" = callPackage ({ mkDerivation, base, containers, data-default, directory , enum-text, filepath, fmt, optparse-applicative, possibly, text @@ -155380,8 +155615,8 @@ self: { }: mkDerivation { pname = "hs-samtools"; - version = "0.7.0.0"; - sha256 = "0fkvq2bg8q0ikg8hwb4lmdjss7jis9ghwnykds6rpa3mlkg22m5g"; + version = "0.9.0.0"; + sha256 = "184axvqq1laryqy22a07d88rm4h1r5lk3mdr14v1ka94na45lh9c"; libraryHaskellDepends = [ ascii attoparsec base bitvec bytestring containers crypton generic-deriving parser-combinators pcre-heavy regex-tdfa streamly @@ -158295,14 +158530,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_6" = callPackage + "hspec_2_11_7" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.6"; - sha256 = "0czsm39vizhm8fjr09sb8652haxb0f81zprr8k7yjpk1kyq5582p"; + version = "2.11.7"; + sha256 = "15ihdrs1jiy1skk7gcr5y7rpfk2fbqpg470kjqzi794vpn510gia"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -158317,8 +158552,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.6"; - sha256 = "0il6vaxkw7d6shjvhj0dp6fhrixwh4aspcqpa0myf8m4vmlp9alb"; + version = "2.11.7"; + sha256 = "1i9i9hislxh6drza9ban2xg0vby2bcnvfwzhzijpipcj450qi7mj"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -158427,6 +158662,8 @@ self: { pname = "hspec-core"; version = "2.10.10"; sha256 = "1djmiy5xjnx71bjagmvipc5dsnvhakm03y72g3vyg7iggxqr6iv4"; + revision = "1"; + editedCabalFile = "0v8byijhsb93ql72n80p6m78yij1axa53fbbnbx1949p5nlzbnnh"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -158444,7 +158681,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_6" = callPackage + "hspec-core_2_11_7" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -158453,8 +158690,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.6"; - sha256 = "1j6pzpmkxrjv7ady2vlf7bx9ayphm2l3bls3fycs9h1lv3k0cni3"; + version = "2.11.7"; + sha256 = "0d5i67vm1skqyign9mi711vhyl72l98cii27vvlbg6x7p239pykg"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -158537,14 +158774,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_6" = callPackage + "hspec-discover_2_11_7" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.6"; - sha256 = "0i87w82gfzkl0dzcg1mvw8jr7ccqd25gq55zbqala8fqanplp7xp"; + version = "2.11.7"; + sha256 = "0anq2b6sg9jmhlwqivgld7w9ipl2nj0rnrc5v46k5ss5pcqb4qi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -158606,6 +158843,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-json_1_0_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec + , HUnit, QuickCheck, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "hspec-expectations-json"; + version = "1.0.2.1"; + sha256 = "15bxyq5hdnr0pqmsj79n2q284fky9h6r8l26q8l4gjf5b5z99gj1"; + libraryHaskellDepends = [ + aeson aeson-pretty base Diff HUnit scientific text + unordered-containers vector + ]; + testHaskellDepends = [ aeson aeson-qq base hspec QuickCheck ]; + description = "Hspec expectations for JSON Values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -158790,14 +159045,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-hedgehog_0_1_0_0" = callPackage + "hspec-hedgehog_0_1_1_0" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-core, QuickCheck , splitmix }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.1.0.0"; - sha256 = "0jlz6niac56v4x3dxd56cmgzxhirsabgyicc39b8iv7b97lc1pkm"; + version = "0.1.1.0"; + sha256 = "1hikvg6y5znxrm9qa4rcn10pghhm5igzvqd35k7k58g30zv5n9z6"; libraryHaskellDepends = [ base hedgehog hspec hspec-core QuickCheck splitmix ]; @@ -158869,7 +159124,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-megaparsec" = callPackage + "hspec-megaparsec_2_2_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -158883,6 +159138,19 @@ self: { testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hspec-megaparsec" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.2.1"; + sha256 = "0bbajckrjxynjmd8ax2xv4k5fbjgrypnmbg8amgwwpy0jrzzbx35"; + libraryHaskellDepends = [ base hspec-expectations megaparsec ]; + testHaskellDepends = [ base hspec megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = lib.licenses.bsd3; }) {}; "hspec-meta_2_7_8" = callPackage @@ -158938,7 +159206,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_6" = callPackage + "hspec-meta_2_11_7" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq , directory, filepath, haskell-lexer, hspec-expectations, HUnit , process, QuickCheck, quickcheck-io, random, stm, tf-random, time @@ -158946,8 +159214,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.6"; - sha256 = "0vn0q7a2r1j8ixlwls8q55gyihv9398wga9804qy51f33y345zqm"; + version = "2.11.7"; + sha256 = "0vfwcrg9iydb2mhjgvysmzmrmw7jy4r12f05sggdk7wpiivy4n6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160315,16 +160583,14 @@ self: { "htaglib" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , hspec-discover, taglib, text, transformers + , hspec-discover, taglib, text }: mkDerivation { pname = "htaglib"; - version = "1.2.0"; - sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; - revision = "3"; - editedCabalFile = "199iqhjcznd3xp5qiinmmasz4aynhgpmsij1ajswasnd4ng127lq"; + version = "1.2.1"; + sha256 = "11dv4am3xkdia6aqcy5sx0v11bb339b3gxs9yzv0fvjbpm6hszkg"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring text transformers ]; + libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; testToolDepends = [ hspec-discover ]; @@ -160615,8 +160881,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; - revision = "5"; - editedCabalFile = "1776z73bs1v8z3qwpjvqqmzdlj6gm8qba93f41irhn7swdppfq72"; + revision = "6"; + editedCabalFile = "0xlzcz5mxp5l6dz2ajraylxkgdbj5yflxh3fr019d3fqvr2a2hwz"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -160896,6 +161162,32 @@ self: { broken = true; }) {}; + "htoml-megaparsec_2_1_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, composition-prelude + , containers, criterion, deepseq, file-embed, hspec, megaparsec + , mtl, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml-megaparsec"; + version = "2.1.0.5"; + sha256 = "1g3wblznbg5414s8s6fym7h99wgiv7m05l4whrdfqq663276rsb5"; + libraryHaskellDepends = [ + base composition-prelude containers deepseq megaparsec mtl text + time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec megaparsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion text ]; + doHaddock = false; + description = "Parser for TOML files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "htoml-parse" = callPackage ({ mkDerivation, base, comonad, containers, dlist, htoml-megaparsec , mtl, prettyprinter, prettyprinter-combinators, text, time @@ -161132,10 +161424,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.14"; - sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; - revision = "1"; - editedCabalFile = "1w1blf2r8riwibv79rcfxij7j60x0sdiqyf7nr5i5rjqbb0sh2k1"; + version = "0.7.15"; + sha256 = "092pqpd9g66pm0w65xmm4k1j8whnzq9xq22dy7xmxh122dydhflm"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -161820,8 +162110,8 @@ self: { }) {}; "http-io-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-builder, brotli-streams + ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson + , base, base64-bytestring, binary, blaze-builder, brotli-streams , bytestring, case-insensitive, containers, cryptohash-sha1 , directory, HsOpenSSL, hspec, hspec-expectations, HUnit , io-streams, lifted-base, mtl, network, network-uri @@ -161830,10 +162120,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.6.2"; - sha256 = "0nil98dnw0y6g417mr9c9dan071ri3726dv0asgwwplq5mwy780q"; - revision = "2"; - editedCabalFile = "0sgk4mgm1r8nnna0lxjw8daa9784rl91qvh4m2ba675f7a016f5c"; + version = "0.1.6.3"; + sha256 = "0m8g00gjwvbjjnvph93c54dm0s5g34zf1ycjd0v5m3ghgsi79q23"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -161841,12 +162129,12 @@ self: { network-uri openssl-streams text transformers xor ]; testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive containers directory HsOpenSSL hspec - hspec-expectations HUnit io-streams lifted-base mtl network - network-uri openssl-streams snap snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers + aeson aeson-pretty attoparsec attoparsec-aeson base + base64-bytestring blaze-builder bytestring case-insensitive + containers directory HsOpenSSL hspec hspec-expectations HUnit + io-streams lifted-base mtl network network-uri openssl-streams snap + snap-core snap-server system-fileio system-filepath text + transformers unordered-containers ]; description = "HTTP and WebSocket client based on io-streams"; license = "BSD-3-Clause AND GPL-2.0-or-later"; @@ -161950,6 +162238,8 @@ self: { pname = "http-media"; version = "0.8.1.1"; sha256 = "10zi0c6v0vngxadlbzfp1y1fgyx1ac5gvyvl0gv6gl8m3grss80r"; + revision = "1"; + editedCabalFile = "0vlaxmh1qqli981bwn3hw0hqfy6spkijdywycnhxi0z1qg5837fk"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -162240,35 +162530,6 @@ self: { }) {}; "http-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, filepath, ghc-prim, HsOpenSSL, hspec - , hspec-expectations, http-common, HUnit, io-streams, lifted-base - , mtl, network, network-uri, openssl-streams, random, snap-core - , snap-server, text, transformers, unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.9.8"; - sha256 = "1dfsynqhl7whrbz8hvjdxlnlnywwywjjm7gkii0jl67k7fxm4375"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory filepath HsOpenSSL http-common - io-streams mtl network network-uri openssl-streams text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams random snap-core snap-server - text transformers unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_9_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson , base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, filepath, ghc-prim, HsOpenSSL, hspec @@ -162295,7 +162556,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-test" = callPackage @@ -167231,32 +167491,32 @@ self: { "ihaskell" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , cmdargs, containers, directory, exceptions, filepath, ghc - , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec - , hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, parsec, process, random, raw-strings-qq, setenv - , shelly, split, stm, strict, text, time, transformers, unix - , unordered-containers, utf8-string, vector + , ghc-boot, ghc-parser, ghc-paths, ghc-syntax-highlighter + , haskeline, hlint, hspec, hspec-contrib, http-client + , http-client-tls, HUnit, ipython-kernel, parsec, process, random + , raw-strings-qq, setenv, shelly, split, stm, strict, text, time + , transformers, unix, unordered-containers, utf8-string, vector }: mkDerivation { pname = "ihaskell"; - version = "0.10.4.0"; - sha256 = "0vl6nmr72abf4jijxga9lnhj1w1iz5b4642r8xnqmavz4ds9qpsv"; + version = "0.11.0.0"; + sha256 = "1mjjsmjvapkmj69qzp9sskgxi04fymacvy0la7lr1rcrl9z5x5hd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring cmdargs containers directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths - haskeline hlint http-client http-client-tls ipython-kernel parsec - process random shelly split stm strict text time transformers unix - unordered-containers utf8-string vector + ghc-syntax-highlighter haskeline hlint http-client http-client-tls + ipython-kernel parsec process random shelly split stm strict text + time transformers unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers directory ghc ipython-kernel process strict text transformers unix unordered-containers ]; testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit + aeson base directory ghc ghc-paths hspec hspec-contrib HUnit raw-strings-qq setenv shelly text transformers ]; description = "A Haskell backend kernel for the Jupyter project"; @@ -167321,20 +167581,18 @@ self: { "ihaskell-diagrams" = callPackage ({ mkDerivation, active, base, bytestring, diagrams, diagrams-cairo - , diagrams-lib, directory, ihaskell, text + , diagrams-lib, directory, filepath, ihaskell, temporary, text }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.3.2.1"; - sha256 = "0ssczqr41nrbrdr95vz457mwxcpmcrwd1bihzccmici1fvjd13rx"; + version = "0.4.0.0"; + sha256 = "1qx2936iwgqvd8911c9rbxd3g8m5maxfdvdfahzwfyasq9l54662"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib - directory ihaskell text + directory filepath ihaskell temporary text ]; description = "IHaskell display instances for diagram types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-display" = callPackage @@ -167394,6 +167652,8 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -167493,22 +167753,21 @@ self: { }) {}; "ihaskell-widgets" = callPackage - ({ mkDerivation, aeson, base, containers, ihaskell, ipython-kernel - , scientific, singletons, text, unix, unordered-containers, vector - , vinyl + ({ mkDerivation, aeson, base, bytestring, containers, ihaskell + , ipython-kernel, scientific, singletons, singletons-base, text + , unix, unordered-containers, vector, vinyl }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.3.3"; - sha256 = "1b4v8ng9y9n9wkadjj06iab71gbqkfr7plxxn1a9fn6qgnnlmdg8"; + version = "0.4.0.0"; + sha256 = "0wm335hf987h82ndy4jq3m9w0nkn7xbycdz0nyi6sfm47q1k7fw4"; libraryHaskellDepends = [ - aeson base containers ihaskell ipython-kernel scientific singletons - text unix unordered-containers vector vinyl + aeson base bytestring containers ihaskell ipython-kernel scientific + singletons singletons-base text unix unordered-containers vector + vinyl ]; description = "IPython standard widgets for IHaskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihp-hsx" = callPackage @@ -171364,8 +171623,8 @@ self: { ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: mkDerivation { pname = "io-classes"; - version = "1.2.0.0"; - sha256 = "136i6py474i1wv0fvav9qb9wrz3clljxixsd4z42qcrzpyry80nn"; + version = "1.3.0.0"; + sha256 = "1k2ngdrpnczdv9kz79bdb9mzwlshba4zas6kksz1qc7fsm7afnj8"; libraryHaskellDepends = [ array async base bytestring mtl stm time ]; @@ -171377,10 +171636,8 @@ self: { ({ mkDerivation, array, base, io-classes, mtl, si-timers }: mkDerivation { pname = "io-classes-mtl"; - version = "0.1.0.1"; - sha256 = "0kqq14jgpkxaz106ahr20apizgdnxz2q0ih9kwgz0q4l1v106698"; - revision = "2"; - editedCabalFile = "15z9s5gx4z9f9sg7fjgi83ri2hpk970sjjigwpdc7ask4f2j9ff4"; + version = "0.1.0.2"; + sha256 = "06v55dppc3l0kcncigv4gkn0fgdr3rgcf78in618y7jnc1xszb6f"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -171455,21 +171712,20 @@ self: { "io-sim" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , exceptions, io-classes, nothunks, parallel, psqueues, QuickCheck - , quiet, si-timers, strict-stm, tasty, tasty-hunit - , tasty-quickcheck, time + , exceptions, io-classes, nothunks, psqueues, QuickCheck, quiet + , si-timers, strict-stm, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "io-sim"; - version = "1.2.0.0"; - sha256 = "1h765ab2853k5q7pg0f9mp65925xs0j2sfm4c87qmiwgy53ac6gb"; + version = "1.3.0.0"; + sha256 = "0mrq1mxlfkwh49skrdk7c3h3qdyf55mkfn6iii5qd3q5x5y7ggc1"; libraryHaskellDepends = [ - base containers deepseq exceptions io-classes nothunks parallel - psqueues QuickCheck quiet si-timers strict-stm time + base containers deepseq exceptions io-classes nothunks psqueues + QuickCheck quiet si-timers strict-stm time ]; testHaskellDepends = [ - array base containers io-classes parallel QuickCheck si-timers - strict-stm tasty tasty-hunit tasty-quickcheck time + array base containers io-classes QuickCheck si-timers strict-stm + tasty tasty-hunit tasty-quickcheck time ]; benchmarkHaskellDepends = [ base criterion io-classes ]; description = "A pure simulator for monadic concurrency with STM"; @@ -172046,6 +172302,29 @@ self: { license = lib.licenses.mit; }) {}; + "ipython-kernel_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , cryptonite, directory, filepath, memory, parsec, process + , temporary, text, transformers, unordered-containers, uuid + , zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.11.0.0"; + sha256 = "19r08fb814fp58wik0iihhypa8awxwpbli3n55gdi4a8xzy1yrdr"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers cryptonite directory + filepath memory parsec process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -172716,27 +172995,6 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.10"; - sha256 = "1017zzav1s00jsxjv419zcrm5i334n9zz42isz6b85hiixqm848v"; - libraryHaskellDepends = [ - base bytestring containers hashable primitive text - unordered-containers vector - ]; - testHaskellDepends = [ - bytestring primitive QuickCheck quickcheck-instances rebase tasty - tasty-quickcheck text vector - ]; - description = "Isomorphism typeclass solving the conversion problem"; - license = lib.licenses.mit; - }) {}; - - "isomorphism-class_0_1_0_11" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck - , text, unordered-containers, vector - }: - mkDerivation { - pname = "isomorphism-class"; version = "0.1.0.11"; sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; libraryHaskellDepends = [ @@ -172749,7 +173007,6 @@ self: { ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "isotope" = callPackage @@ -173770,8 +174027,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.2.2.1"; - sha256 = "0gpyaqrfajcxlgxqjd1kk30a571ini6ikw6n6l2ryzw2971z127n"; + version = "0.2.2.2"; + sha256 = "01wax5spwr6qkkbdwdrlprxj0w7i8g7gijy31hzmllgwqcb59pbb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -174922,8 +175179,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.10"; - sha256 = "0hhj1a6y7c63vka3f0k732clcx80k74syrfv2r996rxfxmlqlj8z"; + version = "0.10.0.1"; + sha256 = "1fbc65dlb5yydcxa4da2plmfyp4136i52zrak4i3vpyf53yfqf1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174934,10 +175191,37 @@ self: { testHaskellDepends = [ aeson base base64-bytestring bytestring concise containers cryptonite hedgehog hspec lens mtl network-uri pem tasty - tasty-hedgehog tasty-hspec text time x509 + tasty-hedgehog tasty-hspec time x509 + ]; + description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library"; + license = lib.licenses.asl20; + }) {}; + + "jose_0_11" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , concise, containers, crypton, crypton-x509, hedgehog, hspec, lens + , memory, monad-time, mtl, network-uri, pem, tasty, tasty-hedgehog + , tasty-hspec, template-haskell, text, time + }: + mkDerivation { + pname = "jose"; + version = "0.11"; + sha256 = "0h0byx4jww4w5k1nl123kr1vgszarjd8ib4cn75xq24ji4yyfx19"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring concise containers crypton + crypton-x509 lens memory monad-time mtl network-uri + template-haskell text time + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring concise containers crypton + crypton-x509 hedgehog hspec lens mtl network-uri pem tasty + tasty-hedgehog tasty-hspec time ]; description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -175660,6 +175944,26 @@ self: { license = lib.licenses.mit; }) {}; + "json-feed_2_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "2.0.0.10"; + sha256 = "0s9fq0yp3svi8jcn2isb4kb5l71hhrahrrflciv1jzbn1kwx8lqj"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -175887,6 +176191,8 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-rpc-client" = callPackage @@ -179001,8 +179307,8 @@ self: { }: mkDerivation { pname = "keycloak-hs"; - version = "3.0.1"; - sha256 = "1311rzvib7cbb2j4bjqbd5y03frsqqn32grhypvk0fplrdr1hazn"; + version = "3.0.2"; + sha256 = "077gmrfsffkpli5ws04laz861fd4qikrs4ihi3h7sjsqrljfx512"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179673,9 +179979,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kmonad"; - broken = true; }) {}; "kmp-dfa" = callPackage @@ -180610,6 +180914,19 @@ self: { license = lib.licenses.mit; }) {}; + "lackey_2_0_0_7" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "2.0.0.7"; + sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; + libraryHaskellDepends = [ base servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181558,19 +181875,15 @@ self: { "lame" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath - , hspec, hspec-discover, htaglib, mp3lame, temporary, text - , transformers, wave + , hspec, hspec-discover, htaglib, mp3lame, temporary, text, wave }: mkDerivation { pname = "lame"; - version = "0.2.1"; - sha256 = "1xz98v2kqs69jijza0vyz57lpbs3h2f7fcablihlzprh1sylc3vq"; - revision = "1"; - editedCabalFile = "15jf93rcjwzgl0780c86nn29dif6avwpj3x4xpkq5lmll9zxqj60"; + version = "0.2.2"; + sha256 = "0zfjiyabzzkg9mdy8ynf9sa89zcdpvynzhph7svyjxw6a6h0i0mg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory exceptions filepath text transformers - wave + base bytestring directory exceptions filepath text wave ]; librarySystemDepends = [ mp3lame ]; testHaskellDepends = [ @@ -181600,6 +181913,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "laminar" = callPackage + ({ mkDerivation, async, base, containers, random, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "laminar"; + version = "0.1.0.1"; + sha256 = "1cpkj7zmg29cy9ijl74js3agxbmg8crkg7pykg6l9vqiqpczpajh"; + libraryHaskellDepends = [ async base containers random text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Run dependent IO actions asynchronously"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "landlock" = callPackage ({ mkDerivation, async, base, directory, exceptions, filepath , markdown-unlit, optparse-applicative, process, psx, QuickCheck @@ -181809,6 +182138,8 @@ self: { pname = "language-c"; version = "0.9.2"; sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"; + revision = "1"; + editedCabalFile = "03qfp9mf4yrdw3m6sab3np7wjaigg5p3xiiirxin8ihsnnx4rv5l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -182110,13 +182441,13 @@ self: { ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { pname = "language-dot"; - version = "0.1.1"; - sha256 = "176fc2y7j1b5fqa75q38cqfdyjqpc6i40hncc6r2apcbxdriryfn"; + version = "0.1.2"; + sha256 = "1ikhamvrri7hm9qngpz8an3fsc9jkqqkg9h47lylmg3vi8dd4bgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; executableHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base parsec pretty ]; description = "A library for the analysis and creation of Graphviz DOT files"; license = lib.licenses.bsd3; mainProgram = "ppdot"; @@ -182730,16 +183061,17 @@ self: { , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filecache, filepath, formatting, Glob , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data - , http-client, lens, megaparsec, memory, mtl, operational - , optparse-applicative, parsec, parser-combinators, pcre-utils - , protolude, random, regex-pcre-builtin, scientific, servant - , servant-client, split, stm, strict-base-types, temporary, text - , time, transformers, unix, unordered-containers, vector, yaml + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "language-puppet"; - version = "1.4.6.5"; - sha256 = "0j32504iwla8h33h4nycx6gwp46kvlqp1d6c9wirygm8ng3vpz6r"; + version = "1.5.1"; + sha256 = "0bp2kikva16iasmv1mwgm8lkz3srk3mpx37xaphy7jdd50lc5nn5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182747,10 +183079,10 @@ self: { aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring case-insensitive containers cryptonite directory filecache filepath formatting hashable hruby hslogger http-api-data http-client lens - megaparsec memory mtl operational parsec parser-combinators - pcre-utils protolude random regex-pcre-builtin scientific servant - servant-client split stm strict-base-types text time transformers - unix unordered-containers vector yaml + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base bytestring containers Glob hslogger @@ -183023,8 +183355,8 @@ self: { pname = "language-toolkit"; version = "1.1.0.0"; sha256 = "0ffr53jggh3c01v802xywy387jv5wa5vwwyvipiqpxwqcspr4nd7"; - revision = "1"; - editedCabalFile = "129ya22xxv71hv8xxknlpd9ig3xbwld00likf19g7b6psnx60kk0"; + revision = "4"; + editedCabalFile = "13m1qsn04yc4q04xihjivb6pz73gv0sn9d5qxb9q1a4cg63k21c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq parallel ]; @@ -183654,8 +183986,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.0.0"; - sha256 = "1sq5sl0m2nnzh23rvwknmkbxmrvyiik0rlqh4fhzbirm8h0si44b"; + version = "4.0.1"; + sha256 = "0rmjkdlbayfp3bgwyw0rkpj7cc4fkgsh1f6388v6hhdip3j8r9ni"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -185540,8 +185872,8 @@ self: { pname = "lentil"; version = "1.5.6.0"; sha256 = "0sjhhvrw3xbisg8mi1g67yj5r43wzyhqav61wm0ynb1wakc7das1"; - revision = "2"; - editedCabalFile = "1075p06xxahc00pqvk6025axvbcfyzw41cqgrhizj1kbrs1alrlb"; + revision = "3"; + editedCabalFile = "0zaky33crps113gar0hh2zbi69ijfhhhfp6rg64jnl41vby83dhk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189367,6 +189699,23 @@ self: { mainProgram = "list-remote-forwards"; }) {}; + "list-shuffle" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, primitive, random + , tasty-bench + }: + mkDerivation { + pname = "list-shuffle"; + version = "1.0.0"; + sha256 = "03qvms9z3jrcz1lswb6kzyk8bw9gafmkz5yil7vi3jirhxxq7491"; + libraryHaskellDepends = [ base primitive random ]; + testHaskellDepends = [ base hedgehog random ]; + benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; + description = "List shuffling and sampling"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "list-singleton" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193020,6 +193369,8 @@ self: { pname = "lucid"; version = "2.11.20230408"; sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"; + revision = "1"; + editedCabalFile = "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers @@ -193185,6 +193536,8 @@ self: { pname = "lucid2"; version = "0.0.20230706"; sha256 = "165bar5kgdrldg46f743jhf0p2krvrrpsg0my7zbgxyjayrwf8bd"; + revision = "1"; + editedCabalFile = "0h6s6mdvb0n7b8nx5cwks6s9lglazmy8qigbrmnzfm4zbmh7r58m"; libraryHaskellDepends = [ base bytestring containers mtl text transformers ]; @@ -193672,8 +194025,8 @@ self: { }: mkDerivation { pname = "lz4-hs"; - version = "0.1.5.1"; - sha256 = "1kl8zxladsby7y5fk2gdkipjn6kb8kkzdpf8xccnvhmgzn8qj4cn"; + version = "0.1.5.2"; + sha256 = "1lqh2sahmk4z0hw4insknzrs9a80872mfpvqacdi41qggp1b1qlb"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -193727,6 +194080,8 @@ self: { pname = "lzma"; version = "0.0.1.0"; sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; + revision = "1"; + editedCabalFile = "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ @@ -194666,6 +195021,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mailtrap" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, bytestring + , email-validate, filepath, http-conduit, mime-types, text, time + , unordered-containers, uuid-types + }: + mkDerivation { + pname = "mailtrap"; + version = "0.1.1.0"; + sha256 = "177zfswsgg8r51pzjvyf7k4dnvrfq3zj82b54xh5vdpd74k3x2ng"; + libraryHaskellDepends = [ + aeson base base64 blaze-html bytestring email-validate filepath + http-conduit mime-types text time unordered-containers uuid-types + ]; + description = "Mailtrap API library"; + license = lib.licenses.mit; + }) {}; + "main-tester" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-core , QuickCheck, text @@ -195581,6 +195953,32 @@ self: { broken = true; }) {}; + "mappings" = callPackage + ({ mkDerivation, base, cond, containers, formatting, hspec + , partialord + }: + mkDerivation { + pname = "mappings"; + version = "0.1.0.0"; + sha256 = "0xkb3zqr1iqjz4kfk6pzq17jxywx96lbxs59izg4fc4wwfz08l2w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cond containers formatting partialord + ]; + executableHaskellDepends = [ + base cond containers formatting partialord + ]; + testHaskellDepends = [ + base cond containers formatting hspec partialord + ]; + description = "Types which represent functions k -> v"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "view"; + broken = true; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -196435,29 +196833,6 @@ self: { }) {}; "math-functions" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, gauge - , primitive, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.3.4.2"; - sha256 = "18y1hlc8p6yyxa14zdbm84aaq58kksbrlfp3rj2bd4ilsb00mrf1"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector - ]; - testHaskellDepends = [ - base data-default-class deepseq erf primitive QuickCheck tasty - tasty-hunit tasty-quickcheck vector vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base data-default-class gauge random vector - ]; - description = "Collection of tools for numeric computations"; - license = lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_4_3" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, primitive , QuickCheck, random, tasty, tasty-bench, tasty-hunit , tasty-quickcheck, vector, vector-th-unbox @@ -196478,7 +196853,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "math-grads" = callPackage @@ -197985,17 +198359,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec_9_5_0" = callPackage + "megaparsec_9_6_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text , transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "9.5.0"; - sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; - revision = "4"; - editedCabalFile = "0f6g05w18kn34rcjkxfdsg4sibxsz41p2xac7wfc9wqpr0l9kg55"; + version = "9.6.1"; + sha256 = "1zyb1mqa2mjjig5aggndifh6zqlwbw8sn4nm4an73gkxhjz5f8m3"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -198033,17 +198405,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec-tests_9_5_0" = callPackage + "megaparsec-tests_9_6_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-megaparsec, megaparsec, mtl , QuickCheck, scientific, temporary, text, transformers }: mkDerivation { pname = "megaparsec-tests"; - version = "9.5.0"; - sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; - revision = "2"; - editedCabalFile = "1zh7ggvc1453b734mmc7yyd8f6qrr34bnvab0507l1nflml7w9bb"; + version = "9.6.1"; + sha256 = "1l3rmg4ymw4czqkkb3502g322ijdg11c1img9l4p6ipy7hdzw52n"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -200023,20 +200393,118 @@ self: { }) {}; "mig" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , case-insensitive, containers, exceptions, http-api-data - , http-types, mtl, text, wai, warp + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, exceptions, extra, filepath, hspec + , http-api-data, http-media, http-types, insert-ordered-containers + , lens, lrucache, mtl, openapi3, safe, text, transformers }: mkDerivation { pname = "mig"; - version = "0.1.0.3"; - sha256 = "1xkiq1ca2rxxzn8a8y0scc6w78lwqlxfdskjay38i1ghlq7brb5s"; + version = "0.2.0.1"; + sha256 = "15ljws449p8w8rya8frr6zkagryw84lrpxfs1xjxff8vjgg1n6hw"; libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring case-insensitive - containers exceptions http-api-data http-types mtl text wai warp + aeson base blaze-html bytestring case-insensitive containers + exceptions extra filepath http-api-data http-media http-types + insert-ordered-containers lens lrucache mtl openapi3 safe text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec http-api-data http-types mtl + openapi3 text ]; description = "Build lightweight and composable servers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-client" = callPackage + ({ mkDerivation, base, bytestring, containers, http-api-data + , http-client, http-media, http-types, mig, mtl, text + }: + mkDerivation { + pname = "mig-client"; + version = "0.1.0.1"; + sha256 = "17zlcryagzb7mv9pbfqp7gy47va4mamkxzf01cavzac1cm23hh3w"; + libraryHaskellDepends = [ + base bytestring containers http-api-data http-client http-media + http-types mig mtl text + ]; + description = "Build http-clients from API definition for mig servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-extra" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, data-default, exceptions, extra + , http-api-data, http-media, http-types, mig, mig-client, openapi3 + , template-haskell, text, time, transformers, yaml + }: + mkDerivation { + pname = "mig-extra"; + version = "0.1.0.1"; + sha256 = "0zwzpicvm8fb3hm6f0g0g0zapijz20yzr8hw7i148cc4ihwdxpl9"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers + data-default exceptions extra http-api-data http-media http-types + mig mig-client openapi3 template-haskell text time transformers + yaml + ]; + description = "Extra utils for Mig core library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-server" = callPackage + ({ mkDerivation, aeson, base, blaze-html, data-default + , http-api-data, http-types, mig, mig-extra, mig-swagger-ui + , mig-wai, openapi3, text, transformers, warp + }: + mkDerivation { + pname = "mig-server"; + version = "0.1.0.1"; + sha256 = "0hv58843asha2wqjh6y2pfx6zs3y5azisrdfihd5ml82s92d374d"; + libraryHaskellDepends = [ + aeson base blaze-html data-default http-api-data http-types mig + mig-extra mig-swagger-ui mig-wai openapi3 text transformers warp + ]; + description = "Build lightweight and composable servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-swagger-ui" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, blaze-html + , blaze-markup, bytestring, data-default, file-embed-lzma + , http-api-data, lens, mig, openapi3, text + }: + mkDerivation { + pname = "mig-swagger-ui"; + version = "0.1.0.1"; + sha256 = "1hygqx3f9zq2qir5b2a8bz8yfk2irhmql366jf5817873q7kfvc0"; + libraryHaskellDepends = [ + aeson aeson-pretty base blaze-html blaze-markup bytestring + data-default file-embed-lzma http-api-data lens mig openapi3 text + ]; + description = "Swagger servers for mig library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-wai" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , exceptions, mig, text, wai + }: + mkDerivation { + pname = "mig-wai"; + version = "0.1.0.1"; + sha256 = "1jayzfss1kz4fnyadxjpv4v0dms4j2zgbsddnjvgysgp8fwkb1x8"; + libraryHaskellDepends = [ + base bytestring containers data-default exceptions mig text wai + ]; + description = "Render mig-servers as wai-applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "mighttpd" = callPackage @@ -200369,23 +200837,11 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.1.0"; - sha256 = "06z1z5q7c77sdaych0jq1d54vdkrx1gybzyl6crcnhkiwga1xl7b"; - libraryHaskellDepends = [ base bytestring containers text ]; - description = "Basic mime-type handling types and functions"; - license = lib.licenses.mit; - }) {}; - - "mime-types_0_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "mime-types"; version = "0.1.2.0"; sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "min-max-pqueue" = callPackage @@ -204606,27 +205062,6 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.4"; - sha256 = "1ycxv01hf7svhaczsdprklh1r96300zdlkhar8dxwggajs9njyjn"; - libraryHaskellDepends = [ - base bytestring commutative-semigroups containers primes text - vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_2_4_1" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, primes, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; version = "1.2.4.1"; sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; libraryHaskellDepends = [ @@ -204639,7 +205074,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -205968,6 +206402,27 @@ self: { mainProgram = "mp3driver"; }) {}; + "mpd-current-json" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, libmpd + , optparse-applicative + }: + mkDerivation { + pname = "mpd-current-json"; + version = "1.2.0.0"; + sha256 = "0ih0x53mwgpk87mznhhwhjhgznl6ap8i5skb9lmsfpnpmy27xh7s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base libmpd ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring libmpd optparse-applicative + ]; + description = "Print current MPD song and status as JSON"; + license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + mainProgram = "mpd-current-json"; + broken = true; + }) {}; + "mpdmate" = callPackage ({ mkDerivation, base, directory, network, powermate, unix }: mkDerivation { @@ -206858,6 +207313,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mstate_0_2_10" = callPackage + ({ mkDerivation, base, fail, monad-peel, mtl, stm }: + mkDerivation { + pname = "mstate"; + version = "0.2.10"; + sha256 = "1lx50m7hhlpq3i1aha1pixb9xf3rbvdz2pg4hgmz93kkvz0fdpkf"; + libraryHaskellDepends = [ base fail monad-peel mtl stm ]; + description = "MState: A consistent State monad for concurrent applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "msu" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, directory , errors, filepath, hspec, parsec, process, unliftio, yaml @@ -208943,8 +209410,8 @@ self: { pname = "mvc"; version = "1.1.7"; sha256 = "1887z2im418rzkqin2mk7f839qgvv4snnxm2qzlcnym89hspz37w"; - revision = "1"; - editedCabalFile = "0cpffbbyzs6z5wrdk6jmcilnlq746p71x5sdk0pcy1gyklal5kx6"; + revision = "2"; + editedCabalFile = "1w15ngkvw89j81xcl65jl3ryfjanky6l4xsa8yh91zy0imynq874"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -208962,8 +209429,8 @@ self: { pname = "mvc-updates"; version = "1.2.0"; sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; - revision = "1"; - editedCabalFile = "1rnp1y18mrrf05ywj557jmfhjscy8wgjhj2y0wb8xm8ifwccv24a"; + revision = "2"; + editedCabalFile = "1al0sfcnyrrqyxlm3rg1zwg2iyk9am1j80g37x6hcg5prxqx98m0"; libraryHaskellDepends = [ async base foldl mvc ]; description = "Concurrent and combinable updates"; license = lib.licenses.bsd3; @@ -209505,17 +209972,17 @@ self: { }) {}; "mysql-json-table" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, mysql - , mysql-simple + ({ mkDerivation, aeson, base, bytestring, conduit, exceptions + , mysql, mysql-simple }: mkDerivation { pname = "mysql-json-table"; - version = "0.1.0.0"; - sha256 = "1mc4xjgvwj1h687f4rh8sy5q102rg17ppszfyph8h0hkahy6nqxc"; + version = "0.1.2.0"; + sha256 = "0k27jbm1pg07bk633h7zvkgfd28m35vds31ibz5mizll8xwvaz4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring conduit mysql mysql-simple + aeson base bytestring conduit exceptions mysql mysql-simple ]; executableHaskellDepends = [ base conduit mysql-simple ]; description = "Using MySQL to store id-to-json tables"; @@ -210504,6 +210971,24 @@ self: { broken = true; }) {}; + "national-australia-bank" = callPackage + ({ mkDerivation, base, bytestring, containers, digit, directory + , filepath, lens, mtl, parsec, sv, time, transformers, utf8-string + , validation + }: + mkDerivation { + pname = "national-australia-bank"; + version = "0.0.2"; + sha256 = "1cpswfd21an4w2nmycyqk5sblaifm5rxqlh8lbhnqf55crmk0c3a"; + libraryHaskellDepends = [ + base bytestring containers digit directory filepath lens mtl parsec + sv time transformers utf8-string validation + ]; + description = "Functions for National Australia Bank transactions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nationstates" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, tls, transformers, xml @@ -214277,12 +214762,12 @@ self: { "nix-narinfo" = callPackage ({ mkDerivation, attoparsec, base, containers, filepath, hspec - , QuickCheck, text + , hspec-discover, QuickCheck, text }: mkDerivation { pname = "nix-narinfo"; - version = "0.1.0.1"; - sha256 = "0bw5whywbhcj18y733wqq5cgci4yijrz648sby8r3qihn8man3ch"; + version = "0.1.0.2"; + sha256 = "047qdxq27siwkvhs2sc7p380k8dlzdinkbj3d7g63i3qv0vz4lci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text ]; @@ -214290,6 +214775,7 @@ self: { testHaskellDepends = [ attoparsec base filepath hspec QuickCheck text ]; + testToolDepends = [ hspec-discover ]; description = "Parse and render .narinfo files"; license = lib.licenses.bsd3; mainProgram = "pretty-narinfo"; @@ -214452,16 +214938,16 @@ self: { "nixfmt" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec - , parser-combinators, safe-exceptions, text, unix + , parser-combinators, safe-exceptions, scientific, text, unix }: mkDerivation { pname = "nixfmt"; - version = "0.5.0"; - sha256 = "0rxi8zrd2xr72w673nvgnhb0g3r7rssc1ahlhz8rmdpc6c1a82wl"; + version = "0.6.0"; + sha256 = "0jgg8cp2q6ip15cjw10zk2ff4avqc5nwd8amkrrqm0zka41pc0jz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base megaparsec parser-combinators text + base megaparsec parser-combinators scientific text ]; executableHaskellDepends = [ base cmdargs directory filepath safe-exceptions text unix @@ -215193,6 +215679,8 @@ self: { pname = "nonempty-vector"; version = "0.2.3"; sha256 = "18xcsw2c9gy03dvrlanh799j1ab6dkpd6wwgj8b681r12ha04dqa"; + revision = "1"; + editedCabalFile = "0kn1s5ssan9m4xwf10y2ymba4zw2j18j6dvbpr6iral3rrlgngdw"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck vector @@ -215527,6 +216015,8 @@ self: { pname = "nothunks"; version = "0.1.4"; sha256 = "0x8km8pmdnjsafchndzxrypldxscj8h080i14hvkj2ypfkmh52l8"; + revision = "1"; + editedCabalFile = "0xv39s948j50ym1fn5h7xfxr6zl4v7h2mc68qrp4zz2mahx9mk7d"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector ]; @@ -215537,6 +216027,25 @@ self: { license = lib.licenses.asl20; }) {}; + "nothunks_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim + , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector + }: + mkDerivation { + pname = "nothunks"; + version = "0.1.5"; + sha256 = "1s5x4g5g62bs3jd44p2p9lvv01gwarm8jmmigm1d3i8ia8w0lz4w"; + libraryHaskellDepends = [ + base bytestring containers ghc-heap stm text time vector + ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog random stm tasty tasty-hedgehog + ]; + description = "Examine values for unexpected thunks"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "notifications-tray-icon" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers, dbus , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger @@ -215570,8 +216079,8 @@ self: { }: mkDerivation { pname = "notmuch"; - version = "0.3.1"; - sha256 = "1lvxrljzgpc1rgdgrb6x35k3syc9wnnh3acr8dbfj7n2giq5ganr"; + version = "0.3.1.1"; + sha256 = "18z8pbqagdyd5rqv42i6060vv40gv84dx3sf52vvrayga19k1ydw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217191,8 +217700,8 @@ self: { ({ mkDerivation, array, base, deepseq, random, time }: mkDerivation { pname = "oalg-base"; - version = "1.0.0.0"; - sha256 = "1x5k59wj08fr7h1ycwwalf669xia9573hhykl0x09zz50zfjzl41"; + version = "1.1.0.0"; + sha256 = "1zsfbdyz3m9alg1cvsiz64gqivbldgkwg60b6lkl6b7axx6ys4j9"; libraryHaskellDepends = [ array base deepseq random time ]; testHaskellDepends = [ array base deepseq random time ]; description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems"; @@ -221353,6 +221862,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "ordering-duplicates" = callPackage + ({ mkDerivation, base, contravariant, lens, mtl }: + mkDerivation { + pname = "ordering-duplicates"; + version = "0.0.2"; + sha256 = "1c2d2np8dqxsbhkdjk3lzh0ninlzcbdczd0bkq1przcraswxsll5"; + libraryHaskellDepends = [ base contravariant lens mtl ]; + description = "Functions for detecting duplicates"; + license = lib.licenses.bsd3; + }) {}; + "ordering-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -221772,6 +222292,40 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_7_3_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, deepseq, Diff, directory, file-embed + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.3.0"; + sha256 = "1lmzmz8gfh994fmwr4cj955a1mny0cqjrqhc4cp0liy3byla92ks"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + deepseq Diff directory file-embed filepath ghc-lib-parser + megaparsec MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -221803,6 +222357,30 @@ self: { license = lib.licenses.asl20; }) {}; + "orville-postgresql" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , hedgehog, network-uri, postgresql-libpq, random, resource-pool + , safe-exceptions, text, time, transformers, unliftio-core, uuid + }: + mkDerivation { + pname = "orville-postgresql"; + version = "1.0.0.0"; + sha256 = "1gri9224fsznbfz4ijawjbn32y88wfnry005dk45qg8mdd5gkn33"; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist network-uri + postgresql-libpq random resource-pool safe-exceptions text time + transformers unliftio-core uuid + ]; + testHaskellDepends = [ + attoparsec base bytestring containers hedgehog postgresql-libpq + resource-pool safe-exceptions text time uuid + ]; + description = "A Haskell library for PostgreSQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ory-hydra-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -222006,6 +222584,23 @@ self: { broken = true; }) {}; + "ostree-pin" = callPackage + ({ mkDerivation, base, gi-gio, gi-ostree, simple-cmd-args, unix }: + mkDerivation { + pname = "ostree-pin"; + version = "0.1.1"; + sha256 = "0335p0a5y6fjspvw7fzxfvfvirl28jvmb5mzi7fl88fixxi4jwng"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base gi-gio gi-ostree simple-cmd-args unix + ]; + description = "Tool to update ostree deployment pin"; + license = lib.licenses.gpl3Only; + badPlatforms = lib.platforms.darwin; + mainProgram = "ostree-pin"; + }) {}; + "osx-ar" = callPackage ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { @@ -222891,6 +223486,8 @@ self: { pname = "pagination"; version = "0.2.2"; sha256 = "0k5rd55ssrk2f4vfzwnz09az6p1d6igbfmyyyjvnwwjrgcsmynig"; + revision = "1"; + editedCabalFile = "0nbf6gck16k6hk9pvzbbwhjdqzd16asa3swjx440m9vp3m6hwqbw"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; description = "Framework-agnostic pagination boilerplate"; @@ -223124,7 +223721,7 @@ self: { ]; }) {}; - "pandoc_3_1_8" = callPackage + "pandoc_3_1_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -223143,8 +223740,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.8"; - sha256 = "0yr4lkc50ygwvv9kv6f9s5bclar4syvbcrf9lzdvf3450x00brva"; + version = "3.1.9"; + sha256 = "06l62xpmgr35shld3rk1r4yab4x9019fjf1vz0lajjg5jfbl6sca"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -223794,6 +224391,38 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, gitrev, hashable, hspec-expectations + , lifted-async, lifted-base, mtl, optparse-applicative, pandoc + , pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, typed-process, unix, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "1.8.0"; + sha256 = "0hg2z0byp4px51y8hdfaa4gy1jkr2svfahq9abw1w0sg9r12rjxx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable lifted-async lifted-base mtl pandoc pandoc-types + shakespeare tagsoup template-haskell text typed-process unix yaml + ]; + executableHaskellDepends = [ + base containers directory filepath gitrev optparse-applicative + pandoc pandoc-types template-haskell text typed-process + ]; + testHaskellDepends = [ + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -225638,6 +226267,8 @@ self: { pname = "parser-combinators"; version = "1.3.0"; sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; + revision = "1"; + editedCabalFile = "0xkqxas64dd77lgc341b526rip7vva0ipy2kbczmfga41lz5fnc6"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = lib.licenses.bsd3; @@ -226521,28 +227152,6 @@ self: { }: mkDerivation { pname = "path"; - version = "0.9.2"; - sha256 = "15xxsjdxxqxnh20iqhprbdyhldk2igl5gd4ld6hhk9nqgwqdcr0f"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath hashable template-haskell - text - ]; - testHaskellDepends = [ - aeson base bytestring filepath genvalidity genvalidity-hspec - genvalidity-property hspec mtl QuickCheck template-haskell validity - ]; - description = "Support for well-typed paths"; - license = lib.licenses.bsd3; - }) {}; - - "path_0_9_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, genvalidity, genvalidity-hspec, genvalidity-property - , hashable, hspec, mtl, QuickCheck, template-haskell, text - , validity - }: - mkDerivation { - pname = "path"; version = "0.9.5"; sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; libraryHaskellDepends = [ @@ -226555,7 +227164,6 @@ self: { ]; description = "Support for well-typed paths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "path-binary-instance" = callPackage @@ -226647,6 +227255,8 @@ self: { pname = "path-io"; version = "1.8.1"; sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; + revision = "1"; + editedCabalFile = "092gf9fk6f2h5apv2lgqww49gbqjljz70nz6yp7c1l6rhkmcnxaz"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -226876,6 +227486,28 @@ self: { license = lib.licenses.mit; }) {}; + "patrol_1_0_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, exceptions, hspec, http-client, http-types + , network-uri, text, time, uuid + }: + mkDerivation { + pname = "patrol"; + version = "1.0.0.6"; + sha256 = "02szpfdzhb7b6gklnly45wibma19h7dbklqcrc435ks0bjncgyi7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions + http-client http-types network-uri text time uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions hspec + http-client http-types network-uri text time uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "patronscraper" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt }: mkDerivation { @@ -227727,16 +228359,15 @@ self: { }) {}; "peano" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tasty-bench }: mkDerivation { pname = "peano"; - version = "0.1.0.1"; - sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; - revision = "3"; - editedCabalFile = "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n"; + version = "0.1.0.2"; + sha256 = "0qa2qxm492c4bac8il2riw17djk9pbjymng16dhilnxsimqyi3wa"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base tasty-bench ]; description = "Peano numbers"; - license = "unknown"; + license = lib.licenses.bsd3; }) {}; "peano-inf" = callPackage @@ -228131,8 +228762,8 @@ self: { }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.4.6"; - sha256 = "0mbp4lwqwbhhpsbwi2cxrzr7pq2dg4x0sf9rc32fi6svbbcg1hb8"; + version = "0.1.4.7"; + sha256 = "151s5bqhl89ism9v4h93z0x8g0rcschx58ddvzj09xxxdbnf3rmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -228140,10 +228771,13 @@ self: { avif base bytestring hip JuicyPixels primitive vector vector-algorithms webp ]; + libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm ]; + executableToolDepends = [ cpphs ]; testHaskellDepends = [ base hspec ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ base criterion deepseq filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; @@ -230125,7 +230759,8 @@ self: { "phladiprelio-general-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit , phladiprelio-general-datatype, phladiprelio-general-shared - , phladiprelio-tests, phonetic-languages-constraints-array + , phladiprelio-tests, phonetic-languages-basis + , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics , phonetic-languages-simplified-base, rev-scientific @@ -230133,12 +230768,13 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.10.0.0"; - sha256 = "19sydm9r3ggkbkr53akzv8z504kv2dqcbncf86ivkv9qh56rxk3f"; + version = "0.11.1.0"; + sha256 = "1rlnkfiacz1d73bf503wy609gfq2xh7h912rqqm1g364kj473f2c"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit phladiprelio-general-datatype phladiprelio-general-shared - phladiprelio-tests phonetic-languages-constraints-array + phladiprelio-tests phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-simplified-base rev-scientific @@ -230187,8 +230823,8 @@ self: { "phladiprelio-ukrainian-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-general-datatype, phladiprelio-tests - , phladiprelio-ukrainian-shared + , mmsyn2-array, phladiprelio-general-datatype, phladiprelio-tests + , phladiprelio-ukrainian-shared, phonetic-languages-basis , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-simplified-base @@ -230197,23 +230833,25 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.11.0.1"; - sha256 = "166v5cpdyxs754pmhlm05sbbbvlys8bfmgjr0grrqw6f1rnm1x2d"; + version = "0.12.1.0"; + sha256 = "0k29gyjfdjy2l36i857dhd5d0jk4w33acvy7c56j4m0lmsw0azmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit + async base cli-arguments directory halfsplit mmsyn2-array phladiprelio-general-datatype phladiprelio-tests - phladiprelio-ukrainian-shared phonetic-languages-constraints-array + phladiprelio-ukrainian-shared phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base phonetic-languages-ukrainian-array rev-scientific rhythmic-sequences ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - async base cli-arguments directory halfsplit + async base cli-arguments directory halfsplit mmsyn2-array phladiprelio-general-datatype phladiprelio-tests - phladiprelio-ukrainian-shared phonetic-languages-constraints-array + phladiprelio-ukrainian-shared phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base phonetic-languages-ukrainian-array rev-scientific @@ -232739,6 +233377,26 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "pipes-safe_2_3_5" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.3.5"; + sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; + revision = "1"; + editedCabalFile = "0ddvkil91z0j0n5i1jn6xnj423y5qyi1ax3cdwzb71galfjp7adc"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -233570,6 +234228,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -236101,14 +236761,12 @@ self: { }) {}; "poolboy" = callPackage - ({ mkDerivation, async, base, hspec, hspec-core, safe-exceptions - , stm - }: + ({ mkDerivation, async, base, hspec, hspec-core, stm, unliftio }: mkDerivation { pname = "poolboy"; - version = "0.2.1.0"; - sha256 = "01wz3bcs9az3g3f1a0gz4va22paqny5jsgakp014z2n84ks67kyd"; - libraryHaskellDepends = [ async base safe-exceptions stm ]; + version = "0.2.2.0"; + sha256 = "0d0lxqyf73w7nvgydbgv692zzc0zg2hk8sdd3lb6xyzdqkkd0vf3"; + libraryHaskellDepends = [ async base stm unliftio ]; testHaskellDepends = [ base hspec hspec-core ]; description = "Simple work queue for bounded concurrency"; license = lib.licenses.isc; @@ -237024,31 +237682,6 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.13.1"; - sha256 = "0l8rnsjmxskhlry1p34y1mfcrzwm382v4y2zcwsjhj5r09ihzkm2"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_13_1_1" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, criterion, network-ip - , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; version = "0.13.1.1"; sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; libraryHaskellDepends = [ @@ -237063,7 +237696,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -237912,7 +238544,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "postgresql-typed_0_6_2_4" = callPackage + "postgresql-typed_0_6_2_5" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, convertible, criterion, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default @@ -237922,8 +238554,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.2.4"; - sha256 = "1wdwdghgnh6fip1pi220vnksc2g302g9v2wv2xi9yb0prs29xmsm"; + version = "0.6.2.5"; + sha256 = "0nzibv34m66z495g8qld97lchpdrnwph8h0hhj0dvbdylk99897d"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers crypton crypton-x509 crypton-x509-store crypton-x509-validation @@ -238497,6 +239129,8 @@ self: { pname = "pqueue"; version = "1.5.0.0"; sha256 = "00hzrhz3n55ahyv2h183l72jsl3q01p4ns0063p0vjaa5j6qpy0v"; + revision = "1"; + editedCabalFile = "1n9gypnfgqlc1b6djjbkcr8r7bxqf8mpfd7avcf11s529gzk9qgg"; libraryHaskellDepends = [ base deepseq indexed-traversable ]; testHaskellDepends = [ base deepseq indexed-traversable tasty tasty-quickcheck @@ -238700,6 +239334,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "predicate" = callPackage + ({ mkDerivation, base, contravariant, lens, mtl }: + mkDerivation { + pname = "predicate"; + version = "0.0.4"; + sha256 = "1dil18qzcr8bxf994hf11a1hqj6wd6nd2kg785cijs8hj67a177k"; + libraryHaskellDepends = [ base contravariant lens mtl ]; + description = "Predicates"; + license = lib.licenses.bsd3; + }) {}; + "predicate-class" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -239646,12 +240291,32 @@ self: { pname = "prettyprinter-combinators"; version = "0.1.1.1"; sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; + revision = "1"; + editedCabalFile = "0dp01v9ywwzpvwbiljnlgrazh7pjz8p94wald2rvxa97xzlcm4z2"; + libraryHaskellDepends = [ + base bimap bytestring containers dlist pretty-show prettyprinter + syb template-haskell text unordered-containers vector + ]; + description = "Some useful combinators for the prettyprinter package"; + license = lib.licenses.asl20; + }) {}; + + "prettyprinter-combinators_0_1_2" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, dlist + , pretty-show, prettyprinter, syb, template-haskell, text + , unordered-containers, vector + }: + mkDerivation { + pname = "prettyprinter-combinators"; + version = "0.1.2"; + sha256 = "1kmvzczb9g3m2q7glrhwwaklbjs225xgq61vcp5qbysnyhdbxydi"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector ]; description = "Some useful combinators for the prettyprinter package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -240122,28 +240787,6 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.8"; - sha256 = "1c91izq58s0v9z4p2kb91af179n4dagvwkqqp46fzvam6n2xcrw3"; - libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus foldl list-t primitive - primitive-unlifted profunctors vector - ]; - testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Extras for the \"primitive\" library"; - license = lib.licenses.mit; - }) {}; - - "primitive-extras_0_10_1_10" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck - , vector - }: - mkDerivation { - pname = "primitive-extras"; version = "0.10.1.10"; sha256 = "1b83m53dwd2wagqzf0sy6wzsh3kj8prwdkkh6xbm6x0sqmr5ky8l"; libraryHaskellDepends = [ @@ -240156,7 +240799,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-foreign" = callPackage @@ -241257,17 +241899,16 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.6.1"; - sha256 = "1a8li2wkr2af1d5ddpprxzjs7m2j7ii30k7j93a22isfqmywhhbb"; - revision = "1"; - editedCabalFile = "1jhh1rz5i4mwhxhlc6zcv94qy9khyk3fjdf7cfbwivw1pylwgji1"; - isLibrary = false; + version = "0.4.7.0"; + sha256 = "1pkjca5l5nbvkrhw3s2j54mr0wg5a53wyffzwvhfxmfslgd1s7pw"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring containers filepath ghc-prof js-jquery scientific text unordered-containers vector ]; + executableHaskellDepends = [ base ]; description = "Treemap visualiser for GHC prof files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -242227,8 +242868,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.4"; - sha256 = "1vgrwx36liqkshrfqkrb38nsbq84a6fbnmn0p2v0y76iccd2shid"; + version = "0.10.1"; + sha256 = "0jj2w3hx9bg4zqrrllqz9sg3phb7rgicm1ndyv3zk6g5sy55xzhc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; @@ -242247,8 +242888,8 @@ self: { }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.3"; - sha256 = "117fn2a5821ifl4yv94bwiylbnbhriqgjdl9c4685z98m0n9ryap"; + version = "0.10.1"; + sha256 = "09imzfn6jkcwlsw7ixwz21519cc9pk22l95imwrppkjkkl80q6jq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; @@ -242760,8 +243401,8 @@ self: { pname = "protolude"; version = "0.3.3"; sha256 = "0ihsjx48p9dgsp0i0l73h16mycnba40hyh7412jv3xz9qz9dwfbc"; - revision = "1"; - editedCabalFile = "07hfs830nc1lvcmsw1hhmrmhzq0b8z25dc090wfn25ss2cvrjkjv"; + revision = "2"; + editedCabalFile = "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable mtl mtl-compat stm text transformers transformers-compat @@ -243112,22 +243753,22 @@ self: { "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck + , ghc-prim, hashable, HUnit, mtl, PSQueue, QuickCheck, random + , tagged, tasty, tasty-hunit, tasty-quickcheck , unordered-containers }: mkDerivation { pname = "psqueues"; - version = "0.2.7.3"; - sha256 = "1cmz7spfzx7niglmsphnndh0m4b8njkn0fhb9nshbnbq6nx515yh"; + version = "0.2.8.0"; + sha256 = "0qp48qxqfz3bzl10l1wq3fi2j88bcx71a8g5x3qdaia884wf4vdk"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers + base containers criterion deepseq ghc-prim hashable mtl PSQueue + random unordered-containers ]; description = "Pure priority search queues"; license = lib.licenses.bsd3; @@ -243827,8 +244468,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.6.0.1"; - sha256 = "0gdzdbxgsyps8hqd903bsyja0cr6kbklkicvma62q48wv0y7230j"; + version = "0.6.0.2"; + sha256 = "1nnv48yxvzs0fk5d6syrkijh2ailarqs14iand116hfk7xz6as0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244306,8 +244947,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.16"; - sha256 = "10220z3mg2dqvywsqg8jbgpq5yzwlnv0gc8yv1xwibf8ilwd5km6"; + version = "2.1.0.17"; + sha256 = "1fmnhx9hlxajdbyq71v28b0sc7phgx2h7spi2s5viihpnxzwp3rk"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -245999,8 +246640,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.2.1"; - sha256 = "1kw5bp9yih8z3z7plczwld5xdg46slylszmpd63d2fiq2fx7ii7r"; + version = "0.3.0"; + sha256 = "1kqmdnknwqjc8x1dp7qbaca57y7rkcx3vmx6xxc12yh8f7qc8dx9"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -247515,8 +248156,8 @@ self: { pname = "ral"; version = "0.2.1"; sha256 = "1f6sks81g8zxkgnp7lc5n0aimnvbbvkazassc17z0prs56hs63si"; - revision = "2"; - editedCabalFile = "0s51sjv3npjmvi2d2i3x4qs427h7pa2gm0bwm6m34visk78jaypq"; + revision = "3"; + editedCabalFile = "1a8833bz213ynf9lpmhmsmrzfbvzbm1iznv7hmgkqc8rz93zbvjw"; libraryHaskellDepends = [ adjunctions base bin boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids @@ -247532,8 +248173,8 @@ self: { pname = "ral-lens"; version = "0.2"; sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "3"; - editedCabalFile = "0qpi49n64mvba1v8p6xg81ilnzncrd4li2dawvzr5h1zvav5cn5n"; + revision = "4"; + editedCabalFile = "03wb2rwsh3qwb91iv8ydpbpk74ixfw3krw67dwh4l29057c4p31g"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -247545,8 +248186,8 @@ self: { pname = "ral-optics"; version = "0.2"; sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "3"; - editedCabalFile = "0bc8xs8g9yf592in1g4jfy3fyi2z4wv61sazw9gg377fg7lsm2kv"; + revision = "4"; + editedCabalFile = "17vp96nsgf74b275547mgbwyc858lffy53fggs8nf1b8637mnjvs"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -247615,6 +248256,19 @@ self: { license = lib.licenses.mit; }) {}; + "rampart_2_0_0_7" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "rampart"; + version = "2.0.0.7"; + sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Determine how intervals relate to each other"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -248556,6 +249210,28 @@ self: { license = lib.licenses.mit; }) {}; + "ratel_2_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, uuid + }: + mkDerivation { + pname = "ratel"; + version = "2.0.0.10"; + sha256 = "1vvz9ia5p7phkwryjfwrzfzvrb94r127vy56qkgikwc9jxxdlxlj"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -248571,6 +249247,22 @@ self: { license = lib.licenses.mit; }) {}; + "ratel-wai_2_0_0_5" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "2.0.0.5"; + sha256 = "1y2rcp1birh1akw98zw10qwjwi5wf7qknk7j5xwwjws7hpmmgy2y"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratelimiter" = callPackage ({ mkDerivation, base, containers, extra, mtl, time, timespan , vector @@ -248717,14 +249409,14 @@ self: { broken = true; }) {}; - "rattletrap_12_1_1" = callPackage + "rattletrap_12_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "12.1.1"; - sha256 = "0dmc3zbvrcszp4xgb0fivi2yp4dvi3dj1kmi1kx9dwv12r8is1f9"; + version = "12.1.2"; + sha256 = "0lysr7birh4z8zimn5whqpaxipfsnn6sqppcn5l72sqjq6rdhk3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250408,25 +251100,6 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, data-fix - , free, HUnit, template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.2.2.4"; - sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; - revision = "3"; - editedCabalFile = "06bffrsh1gcp65gyv0837bd3gv5d5h2879nadv29irc52fyvzwxl"; - libraryHaskellDepends = [ - base base-orphans comonad containers data-fix free template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = lib.licenses.bsd2; - }) {}; - - "recursion-schemes_5_2_2_5" = callPackage ({ mkDerivation, base, comonad, containers, data-fix, free, HUnit , template-haskell, th-abstraction, transformers }: @@ -250441,7 +251114,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -253652,25 +254324,24 @@ self: { }) {}; "releaser" = callPackage - ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa - , text + ({ mkDerivation, base, bytestring, Cabal, directory + , pretty-terminal, process, regex-tdfa, text }: mkDerivation { pname = "releaser"; - version = "0.3.0.0"; - sha256 = "0fz8zlkdrk8pjyqxyfyhlvvn68yi9d299z50indyhdnwgd4g94lr"; + version = "0.3.0.2"; + sha256 = "0fph3np0f7xkgs2vz3jiqip7hq7yhr0gmrw9lbv6xdkjjwcn69ll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-tdfa text + base bytestring Cabal directory pretty-terminal process regex-tdfa + text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "releaser"; maintainers = [ lib.maintainers.maralorn ]; - broken = true; }) {}; "relevant-time" = callPackage @@ -253773,6 +254444,8 @@ self: { pname = "relude"; version = "1.2.1.0"; sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; + revision = "1"; + editedCabalFile = "1dqgl50rlrq0d84x5ffm5d4sp275wfm3f03k25ryq0ni1prhrarc"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -254089,6 +254762,8 @@ self: { pname = "repa"; version = "3.4.1.5"; sha256 = "0saa2r94l0x52dlj9402csah96akp5wlc0xaah9p2pb8fv3yvs11"; + revision = "1"; + editedCabalFile = "1bl3q9x6lkkdwb5190nlxwzdil9vww99y57yhr1lab6bzr5qys0q"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -254695,8 +255370,8 @@ self: { pname = "req"; version = "3.13.1"; sha256 = "0cprbfjvzh4fhn1vqyisqcqk236zdn765k6g7a8ssqgkiqaw8i8h"; - revision = "1"; - editedCabalFile = "08x6hs8hazxdypihql8ll90m5i8yrdz9y469s00zzkzwqh6j6xjp"; + revision = "3"; + editedCabalFile = "0dib8rwavjrp2bsv3pl3bgblqdfvky53k7qnv7ca4sq8070aqffp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -254889,16 +255564,14 @@ self: { }) {}; "rere" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , containers, criterion, derp, fin, parsec, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, transformers, vec + ({ mkDerivation, aeson, base, bytestring, clock, containers + , criterion, derp, fin, parsec, QuickCheck, quickcheck-instances + , tasty, tasty-quickcheck, transformers, vec }: mkDerivation { pname = "rere"; - version = "0.2"; - sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr"; - revision = "3"; - editedCabalFile = "01d112sii06yz06lpw5i7q3v4gshha9f0d7vpdc0yj2v34f45crv"; + version = "0.2.0.1"; + sha256 = "1cbdn8jz1zcbddc0b4ahln1k7vwg0npxhmnmqaasm3byrrr6l271"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -254907,8 +255580,8 @@ self: { tasty-quickcheck ]; benchmarkHaskellDepends = [ - aeson attoparsec base bytestring clock containers criterion derp - fin parsec vec + aeson base bytestring clock containers criterion derp fin parsec + vec ]; description = "Regular-expressions extended with fixpoints for context-free powers"; license = lib.licenses.bsd3; @@ -255302,10 +255975,8 @@ self: { ({ mkDerivation, base, effectful-core, resourcet }: mkDerivation { pname = "resourcet-effectful"; - version = "1.0.0.0"; - sha256 = "0446j4ihj3fn6lkqi2b1642ak27l6cpwfv4b73gpanq3nad69fzg"; - revision = "3"; - editedCabalFile = "1w3zij2aj3q06r2773d964pv20ix5n70hf15kawzsd6sadbwymz3"; + version = "1.0.1.0"; + sha256 = "0525jg30d3q545rz4dji8vzbfh2jjfglq9frj8ydwlwd9ylhnsjv"; libraryHaskellDepends = [ base effectful-core resourcet ]; description = "Adaptation of the resourcet library for the effectful ecosystem"; license = lib.licenses.bsd3; @@ -258994,6 +259665,28 @@ self: { license = "unknown"; }) {}; + "rsi-break" = callPackage + ({ mkDerivation, async, base, config-ini, directory, filepath, lens + , monomer, process, text, text-show, time + }: + mkDerivation { + pname = "rsi-break"; + version = "0.1.0.0"; + sha256 = "1gb4l0ydimambxvf6n66df7mik77vgfsdr9hds8w3cna057k2zwd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base config-ini directory filepath lens monomer process text + text-show time + ]; + executableHaskellDepends = [ base monomer process ]; + testHaskellDepends = [ base ]; + description = "Let your mind know that your hands need a rest!"; + license = lib.licenses.bsd2; + badPlatforms = lib.platforms.darwin; + }) {}; + "rspp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -260706,6 +261399,19 @@ self: { license = lib.licenses.mit; }) {}; + "salve_2_0_0_4" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "salve"; + version = "2.0.0.4"; + sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Semantic version numbers and constraints"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -261398,8 +262104,8 @@ self: { }: mkDerivation { pname = "saturn"; - version = "1.0.0.2"; - sha256 = "0n0670s0sgp00lb758vn5gmw7h84csq1sqaha6k3lckczfs72si1"; + version = "1.0.0.3"; + sha256 = "0xilcnica1bzi310x2dv1igdpzk91sqzbzqpjkjd7g6v93pl9xhv"; libraryHaskellDepends = [ base containers hspec parsec QuickCheck text time ]; @@ -261528,20 +262234,23 @@ self: { }) {}; "sayable" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, prettyprinter - , tasty, tasty-ant-xml, tasty-hspec, text + ({ mkDerivation, base, bytestring, containers, exceptions, hspec + , prettyprinter, tasty, tasty-ant-xml, tasty-hspec + , template-haskell, text, th-abstraction }: mkDerivation { pname = "sayable"; - version = "1.2.2.0"; - sha256 = "0dmvdf8zs8sf4lwyjzryb2bszfzwgi0wbh232s41g35070sdhy5q"; + version = "1.2.3.0"; + sha256 = "0swwjp1lkfwv4g92d0f4mb6iza56fpf35af2a5kwhxvjg6kp6w32"; libraryHaskellDepends = [ - base bytestring exceptions prettyprinter text + base bytestring containers exceptions prettyprinter + template-haskell text th-abstraction ]; testHaskellDepends = [ - base hspec prettyprinter tasty tasty-ant-xml tasty-hspec text + base hspec prettyprinter tasty tasty-ant-xml tasty-hspec + template-haskell text ]; - description = "Data structures, classes and operators for constructing context-adjusted pretty output"; + description = "Construction of context-adjusted pretty output"; license = lib.licenses.isc; }) {}; @@ -264170,15 +264879,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_0_1" = callPackage + "secp256k1-haskell_1_1_0" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.0.1"; - sha256 = "02mk6w2hkvd008f4wyz67n2bqp63dckyixnk0brpfvk29vm9my9m"; + version = "1.1.0"; + sha256 = "1k0d3lczsw9cg2yxacgf1w58c5wr4gr2a36v9wdid1b6ah673kbl"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -264616,6 +265325,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "semantic-version" = callPackage + ({ mkDerivation, alphachar, base, digit, lens, parsec, parsers }: + mkDerivation { + pname = "semantic-version"; + version = "0.0.2"; + sha256 = "1sx5ik67gqgzg8cxqd5pg1wkbh8b0j27c3hy19nvqn4bssyms17w"; + libraryHaskellDepends = [ + alphachar base digit lens parsec parsers + ]; + description = "Semantic Version"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semaphore-compat" = callPackage ({ mkDerivation, base, exceptions, unix }: mkDerivation { @@ -265008,6 +265731,8 @@ self: { pname = "sendfile"; version = "0.7.11.4"; sha256 = "1i2i0w18l2ysambyylv93jzy0adiiqwwnhg7zagqb7p2srybxc3k"; + revision = "1"; + editedCabalFile = "0276l0b49b4y4z9dy5a5i7182678vv1flmkhiw1a4jsbmc4mrfgm"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -265053,26 +265778,29 @@ self: { }) {}; "sensei" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, directory - , filepath, fsnotify, hspec, hspec-contrib, hspec-discover - , hspec-wai, http-client, http-types, mockery, network, process - , QuickCheck, silently, stm, text, time, unix, wai, warp + ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring + , casing, containers, directory, filepath, fsnotify, hspec + , hspec-contrib, hspec-discover, hspec-wai, http-client, http-types + , mockery, mtl, network, process, QuickCheck, stm, temporary, text + , time, transformers, unix, wai, warp, yaml }: mkDerivation { pname = "sensei"; - version = "0.7.0"; - sha256 = "032vn93gcya2drlcy4mw2rmncq9i21zrr53kdalsxa7xfsds93hw"; + version = "0.8.0"; + sha256 = "0qmi9qzfbsx9xxkczwjx1pzwmkwpl1dq1c80f4nmjgqh4mm21aw5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - ansi-terminal base bytestring directory filepath fsnotify - http-client http-types network process stm text time unix wai warp + aeson ansi-terminal async base bytestring casing containers + directory filepath fsnotify http-client http-types mtl network + process stm text time transformers unix wai warp yaml ]; testHaskellDepends = [ - ansi-terminal base bytestring directory filepath fsnotify hspec - hspec-contrib hspec-wai http-client http-types mockery network - process QuickCheck silently stm text time unix wai warp + aeson ansi-terminal async base bytestring casing containers + directory filepath fsnotify hspec hspec-contrib hspec-wai + http-client http-types mockery mtl network process QuickCheck stm + temporary text time transformers unix wai warp yaml ]; testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; @@ -265431,6 +266159,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequence-formats_1_8_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.8.0.0"; + sha256 = "0xm0v56q90g89zwphayf6llpnmsrb7asnb06sm5lld4q9jfidi4d"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -268308,8 +269060,8 @@ self: { }: mkDerivation { pname = "servant-serialization"; - version = "0.2.1"; - sha256 = "02xrbdwcnm9i33i386gnnigz1hk76z69iywxi2szzk0l8jnsgd32"; + version = "0.3"; + sha256 = "1nyax605k3dy5h5g0y4wsc7wsksxh352c4yz9vc07kldln6x8498"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272033,8 +272785,8 @@ self: { }: mkDerivation { pname = "si-timers"; - version = "1.2.0.0"; - sha256 = "0abxynhg51bazj1dvd4pxpr6wzfd7gganymlnfj4dxday6y3cnc4"; + version = "1.3.0.0"; + sha256 = "05vclkfidy0cmspa5c79lb8dhn4c2jxq6559vcaq2dkgmqqd3fl5"; libraryHaskellDepends = [ base deepseq io-classes mtl nothunks stm time ]; @@ -272439,6 +273191,19 @@ self: { broken = true; }) {}; + "simdutf" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, system-cxx-std-lib }: + mkDerivation { + pname = "simdutf"; + version = "0.1.0"; + sha256 = "07lvq45j9fcbkjhi733zm7dbjmx28ggv5g69g43yyqqn35223lqr"; + libraryHaskellDepends = [ base system-cxx-std-lib ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell interface to simdutf"; + license = lib.licenses.mit; + }) {}; + "simfin" = callPackage ({ mkDerivation, aeson, base, bytestring, Chart, Chart-diagrams , composition-extra, containers, exceptions, http-client @@ -273187,8 +273952,8 @@ self: { ({ mkDerivation, base, exceptions, extra, haskeline, time }: mkDerivation { pname = "simple-prompt"; - version = "0.2.1"; - sha256 = "0p2xss8l8jzp0dm6ql9sswlsm8mcfxra20dnbnql3bz9v2a2wdhc"; + version = "0.2.2"; + sha256 = "1m8q7jqmdsz3nmsb86i9wy94pxypz172ragx9qfy2v5v0pmc8mww"; libraryHaskellDepends = [ base exceptions extra haskeline time ]; description = "Simple commandline text prompt functions"; license = lib.licenses.bsd3; @@ -273900,6 +274665,8 @@ self: { pname = "singleton-bool"; version = "0.1.7"; sha256 = "16xj7d3qnd8nhk66kxm5c145l1060m9yz2yc9y47wsf3hriijb8w"; + revision = "1"; + editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -274320,23 +275087,6 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.3.1"; - sha256 = "1x2z8iw4jgcp6xirclifjhh3rvyjy5xgqrd6lcv4gifj859sfjd2"; - revision = "1"; - editedCabalFile = "1fmqqnf3b3pjcs4h68r8ry8qci9gcl2ccwifn3dxribcm8c0n3lp"; - libraryHaskellDepends = [ - base dictionary-sharing template-haskell testing-type-modifiers - ]; - description = "Sized functors, for size-based enumerations"; - license = lib.licenses.bsd3; - }) {}; - - "size-based_0_1_3_2" = callPackage - ({ mkDerivation, base, dictionary-sharing, template-haskell - , testing-type-modifiers - }: - mkDerivation { - pname = "size-based"; version = "0.1.3.2"; sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; libraryHaskellDepends = [ @@ -274344,7 +275094,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sized" = callPackage @@ -275222,26 +275971,6 @@ self: { }) {}; "slave-thread" = callPackage - ({ mkDerivation, base, deferred-folds, focus, foldl, QuickCheck - , quickcheck-instances, rerebase, SafeSemaphore, stm-containers - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "slave-thread"; - version = "1.1.0.2"; - sha256 = "1pbffrmwd975as495b5b4ad59rajgq1dmbvmp07zfb2rmwhpr5n8"; - libraryHaskellDepends = [ - base deferred-folds focus foldl stm-containers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase SafeSemaphore tasty - tasty-hunit tasty-quickcheck - ]; - description = "A fundamental solution to ghost threads and silent exceptions"; - license = lib.licenses.mit; - }) {}; - - "slave-thread_1_1_0_3" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, rerebase , SafeSemaphore, stm-containers, tasty, tasty-hunit }: @@ -275255,7 +275984,6 @@ self: { testHaskellDepends = [ rerebase SafeSemaphore tasty tasty-hunit ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "sleep" = callPackage @@ -276548,33 +277276,35 @@ self: { }) {}; "snap" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal - , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, hashable, heist, http-streams - , HUnit, lens, lifted-base, map-syntax, monad-control, mtl - , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core - , snap-server, stm, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-smallcheck, text, time - , transformers, transformers-base, unordered-containers, xmlhtml + ({ mkDerivation, aeson, async, attoparsec, attoparsec-aeson, base + , bytestring, cereal, clientsession, configurator, containers + , deepseq, directory, directory-tree, dlist, filepath, hashable + , heist, http-streams, HUnit, lens, lifted-base, map-syntax + , monad-control, mtl, mwc-random, pwstore-fast, QuickCheck + , smallcheck, snap-core, snap-server, stm, syb, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-smallcheck, text, time, transformers + , transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.1.3.2"; - sha256 = "11l7jhch504sbiqdqqjx89cav3qxhkgygvlacfvvl22sya1a4kaf"; + version = "1.1.3.3"; + sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clientsession configurator - containers directory directory-tree dlist filepath hashable heist - lens lifted-base map-syntax monad-control mtl mwc-random - pwstore-fast snap-core snap-server stm text time transformers - transformers-base unordered-containers xmlhtml + aeson attoparsec attoparsec-aeson base bytestring cereal + clientsession configurator containers directory directory-tree + dlist filepath hashable heist lens lifted-base map-syntax + monad-control mtl mwc-random pwstore-fast snap-core snap-server stm + text time transformers transformers-base unordered-containers + xmlhtml ]; testHaskellDepends = [ - aeson async attoparsec base bytestring cereal clientsession - configurator containers deepseq directory directory-tree dlist - filepath hashable heist http-streams HUnit lens lifted-base - map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck - smallcheck snap-core snap-server stm syb test-framework - test-framework-hunit test-framework-quickcheck2 + aeson async attoparsec attoparsec-aeson base bytestring cereal + clientsession configurator containers deepseq directory + directory-tree dlist filepath hashable heist http-streams HUnit + lens lifted-base map-syntax monad-control mtl mwc-random + pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb + test-framework test-framework-hunit test-framework-quickcheck2 test-framework-smallcheck text time transformers transformers-base unordered-containers xmlhtml ]; @@ -276892,8 +277622,8 @@ self: { pname = "snap-server"; version = "1.1.2.1"; sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54"; - revision = "2"; - editedCabalFile = "06nw6s7cmx0ap0v9qnjcrrnlrrm2px7msdc8rgv3l349rip34whl"; + revision = "3"; + editedCabalFile = "0adjcah7hx47cg066jbjjgn7wz8pvkm0fc87fyz8c7lc0sdmp84f"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -278712,15 +279442,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "some_1_0_5" = callPackage - ({ mkDerivation, base, deepseq }: + "some_1_0_6" = callPackage + ({ mkDerivation, base, base-orphans, deepseq }: mkDerivation { pname = "some"; - version = "1.0.5"; - sha256 = "0pwivkyhdndh9f79gsz5gx51if8wm3r8mvbkysz2pq5m77g7kpmh"; - revision = "1"; - editedCabalFile = "060vrbwlc4xrwkh92q3jkgdy7zjzrzlg2k0ll0wklxaph9siphzr"; - libraryHaskellDepends = [ base deepseq ]; + version = "1.0.6"; + sha256 = "1fdzhi2rmcigb1c727dyzfak8rgb77bzfr33k1cp987lbnnhd9pp"; + libraryHaskellDepends = [ base base-orphans deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; @@ -279208,8 +279936,8 @@ self: { ({ mkDerivation, base, lens, parsers }: mkDerivation { pname = "spacechar"; - version = "0.0.0.5"; - sha256 = "0wri929s3icffs63z0m7fxb22rd87w7fi8dwlbzdm6q5w29pxxnk"; + version = "0.0.0.6"; + sha256 = "1jg319wsqhkd4dyfsbrhq7y31mlbgw9ymy9iqps764i92ng5hwrf"; libraryHaskellDepends = [ base lens parsers ]; description = "Space Character"; license = lib.licenses.bsd3; @@ -280176,6 +280904,8 @@ self: { pname = "spir-v"; version = "0.0.1.0"; sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr"; + revision = "1"; + editedCabalFile = "17y0ivzqw7piqpglsrva8six7k0jra76nz83zaxiwin5iawsj8z1"; libraryHaskellDepends = [ base ]; description = "Some utilities for reading and writing SPIR-V files"; license = lib.licenses.mit; @@ -282842,8 +283572,10 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.0.1"; - sha256 = "1f4sk6j9dbnjrb3hjjj9gpbzs66mkmij208vqyvb4z284agfhzng"; + version = "0.1.0.2"; + sha256 = "03zalyk0ickp9acfi6s869h4p3a7djpzpiwsp3nlhwhbdv2si9q4"; + revision = "1"; + editedCabalFile = "1dhcx7q4n4yrp9kxqzwha5spzxfqqzwax43gw82ncdh1ykinjgyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284122,27 +284854,6 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.2.0.2"; - sha256 = "191yh7whd9x6vjn58saac8nq6rsi7fjq147nbmfmn3kfnxqgabdd"; - libraryHaskellDepends = [ - base deferred-folds focus hashable list-t stm-hamt transformers - ]; - testHaskellDepends = [ - deferred-folds focus foldl free list-t quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - description = "Containers for STM"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "stm-containers_1_2_0_3" = callPackage - ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable - , list-t, quickcheck-instances, rerebase, stm-hamt, tasty - , tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "stm-containers"; version = "1.2.0.3"; sha256 = "1cchysjykxiq3s85xaafxkz8kg1czygjs17jlk6ic3ihv2ybr34j"; libraryHaskellDepends = [ @@ -284154,7 +284865,6 @@ self: { ]; description = "Containers for STM"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -284203,31 +284913,6 @@ self: { "stm-hamt" = callPackage ({ mkDerivation, async, base, criterion, deferred-folds, focus - , free, hashable, list-t, mwc-random-monad, primitive - , primitive-extras, QuickCheck, quickcheck-instances, rebase - , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "stm-hamt"; - version = "1.2.0.13"; - sha256 = "0nbnh7ibdlcp0bw1jzmkdcq8ysdqz3f9143pd3yj635mp0dyxgya"; - libraryHaskellDepends = [ - base deferred-folds focus hashable list-t primitive - primitive-extras transformers - ]; - testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - async criterion focus free mwc-random-monad rebase - ]; - description = "STM-specialised Hash Array Mapped Trie"; - license = lib.licenses.mit; - }) {}; - - "stm-hamt_1_2_0_14" = callPackage - ({ mkDerivation, async, base, criterion, deferred-folds, focus , free, hashable, list-t, primitive, primitive-extras, QuickCheck , quickcheck-instances, random, rebase, rerebase, tasty , tasty-hunit, tasty-quickcheck, transformers @@ -284249,7 +284934,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "stm-incremental" = callPackage @@ -286185,14 +286869,29 @@ self: { license = lib.licenses.mit; }) {}; + "strict-list_0_1_7_3" = callPackage + ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1.7.3"; + sha256 = "0bpsnhhg69dq2m9zbzchzzvgpnr0f0jgzsakcn3yzwld8dckxq67"; + libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; + testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; + description = "Strict linked list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-mvar" = callPackage ({ mkDerivation, base, io-classes, io-sim, nothunks, QuickCheck , tasty, tasty-quickcheck }: mkDerivation { pname = "strict-mvar"; - version = "1.2.0.0"; - sha256 = "0w324i9daxsvc4np9vc8bwija2p943sirbqxhjrf9bg144q3ldvd"; + version = "1.3.0.0"; + sha256 = "0gv4m2rc5809y6b4n9bgzakjndf22crzz0pb9ff3rg4a48vys5ph"; libraryHaskellDepends = [ base io-classes ]; testHaskellDepends = [ base io-sim nothunks QuickCheck tasty tasty-quickcheck @@ -286218,8 +286917,8 @@ self: { ({ mkDerivation, array, base, io-classes, stm }: mkDerivation { pname = "strict-stm"; - version = "1.2.0.0"; - sha256 = "1kxfnvgrvskgn8ip9gga0fwchnnlxydccf03cpbx524lqrmk4d0x"; + version = "1.3.0.0"; + sha256 = "0fpjyzc0qlz66a7pvj3cgfgpj10y61b4wqfbrzgpy3gz2d4i6c8y"; libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; @@ -286229,27 +286928,12 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.5.2"; - sha256 = "15ss649nhq2nxmdssdmi6sv9d40szvzww7vgrrp2rm1c904y0ky8"; - revision = "1"; - editedCabalFile = "123bhh4nd1mp3s9fppfy72lhv5gphbd7970ifb5i14282a9qcsj0"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5_3" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; version = "0.1.5.3"; sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -286648,6 +287332,31 @@ self: { license = lib.licenses.mit; }) {}; + "string-variants_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, hspec + , hspec-core, hspec-discover, hspec-expectations, hspec-hedgehog + , HUnit, mono-traversable, QuickCheck, refined, refinery + , string-conversions, template-haskell, text + }: + mkDerivation { + pname = "string-variants"; + version = "0.3.0.0"; + sha256 = "01j2vwni7cqi3n61b5zyify3srrqbdnngxymxz5brhah822i8hnh"; + libraryHaskellDepends = [ + aeson base bytestring mono-traversable QuickCheck refined refinery + string-conversions template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring hedgehog hspec hspec-core hspec-expectations + hspec-hedgehog HUnit mono-traversable QuickCheck refined refinery + string-conversions template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "Constrained text newtypes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stringable" = callPackage ({ mkDerivation, base, bytestring, system-filepath, text }: mkDerivation { @@ -287037,6 +287746,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.10"; + sha256 = "10028krfmrq8v1k00ihdzp5hl6nrq0vdp3kb9xfgsyqgvv8l2ic2"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path , tasty, tasty-discover, tasty-hspec, tasty-quickcheck @@ -287210,8 +287937,8 @@ self: { pname = "structured"; version = "0.1.1"; sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; - revision = "7"; - editedCabalFile = "1fqc041qxnsj95pd9mfzdz5jn1ibmlml8zx8biqdivmv25xn59am"; + revision = "8"; + editedCabalFile = "02bmn23733plxrpcsfmsfn56hk7i0bjsp4ml85q868zq18m46kwg"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -288856,8 +289583,8 @@ self: { }: mkDerivation { pname = "svgone"; - version = "0.2.0.0"; - sha256 = "1r176z555amzfj1jxpgc6n495rp60v829d5raab8nddj5rhr5p35"; + version = "0.2.0.1"; + sha256 = "0gfi744l0060gs0cdgy7mfd9j6axivkjqbb9ayqa81v7mqrj9nzf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289107,41 +289834,43 @@ self: { }) {inherit (pkgs) tokyocabinet;}; "swarm" = callPackage - ({ mkDerivation, aeson, array, base, blaze-html, boolexpr, brick - , brick-list-skip, bytestring, clock, colour, commonmark - , commonmark-extensions, containers, criterion, directory, dotgen - , either, extra, filepath, fused-effects, fused-effects-lens, fuzzy + ({ mkDerivation, aeson, array, astar, base, blaze-html, boolexpr + , brick, brick-list-skip, bytestring, clock, colour, commonmark + , commonmark-extensions, containers, directory, dotgen, either + , extra, filepath, fused-effects, fused-effects-lens, fuzzy , githash, hashable, hsnoise, http-client, http-client-tls , http-types, lens, linear, lsp, megaparsec, minimorph, mtl - , murmur3, natural-sort, optparse-applicative, parser-combinators - , prettyprinter, QuickCheck, random, servant, servant-docs - , servant-server, SHA, simple-enumeration, split, stm, syb, tagged - , tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-rope, text-zipper, time - , transformers, unification-fd, unordered-containers, vector, vty - , wai, warp, witch, witherable, word-wrap, yaml + , murmur3, natural-sort, optparse-applicative, palette, pandoc + , pandoc-types, parser-combinators, prettyprinter, QuickCheck + , random, scientific, servant, servant-docs, servant-server, SHA + , simple-enumeration, split, stm, syb, tagged, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, terminal-size, text, text-rope, text-zipper + , time, transformers, unification-fd, unordered-containers, vector + , vty, wai, warp, witch, witherable, word-wrap, yaml }: mkDerivation { pname = "swarm"; - version = "0.4"; - sha256 = "150hblxkv8wkx02wxifiyl0k76a7y8fikkx2wxz6ldd223d1yvqa"; + version = "0.5.0.0"; + sha256 = "007647l7janvsfyyapwrr65q6x6dy1jgiaaga4jhfv4gazwssxsm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base blaze-html boolexpr brick brick-list-skip + aeson array astar base blaze-html boolexpr brick brick-list-skip bytestring clock colour commonmark commonmark-extensions containers directory dotgen either extra filepath fused-effects fused-effects-lens fuzzy githash hashable hsnoise http-client http-client-tls http-types lens linear lsp megaparsec minimorph mtl - murmur3 natural-sort parser-combinators prettyprinter random - servant servant-docs servant-server SHA simple-enumeration split - stm syb tagged template-haskell text text-rope text-zipper time - transformers unification-fd unordered-containers vector vty wai - warp witch witherable word-wrap yaml + murmur3 natural-sort palette pandoc pandoc-types parser-combinators + prettyprinter random scientific servant servant-docs servant-server + SHA simple-enumeration split stm syb tagged template-haskell text + text-rope text-zipper time transformers unification-fd + unordered-containers vector vty wai warp witch witherable word-wrap + yaml ]; executableHaskellDepends = [ - base githash optparse-applicative text + base githash optparse-applicative prettyprinter terminal-size text ]; testHaskellDepends = [ aeson base boolexpr containers directory filepath fused-effects @@ -289149,7 +289878,7 @@ self: { tasty-hunit tasty-quickcheck text time transformers vty witch yaml ]; benchmarkHaskellDepends = [ - base containers criterion lens linear mtl random text + base containers lens linear mtl random tasty-bench text ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; @@ -291062,8 +291791,8 @@ self: { pname = "system-filepath"; version = "0.4.14"; sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; - revision = "1"; - editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8"; + revision = "2"; + editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ @@ -291840,6 +292569,8 @@ self: { pname = "tagged-identity"; version = "0.1.4"; sha256 = "0mq4q4i16lzm1d0ckarwjk2a47y28lfrv0hc31y0xblb9q50xxwl"; + revision = "1"; + editedCabalFile = "03r7ys57zbyadkka5rzb418y5ksb88nnmvxjs58j0pmp71h0zfa6"; libraryHaskellDepends = [ base mtl transformers ]; description = "Trivial monad transformer that allows identical monad stacks to have different types"; license = lib.licenses.bsd3; @@ -292270,11 +293001,12 @@ self: { ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base , base32, base32string, base64, base64-bytestring, binary , bytestring, cborg, cborg-json, connection, containers, cryptonite - , data-default-class, deriving-aeson, directory, filepath, foldl - , hspec, hspec-expectations, hspec-wai, http-api-data, http-client - , http-client-tls, http-media, http-types, http2, lens, megaparsec - , memory, network, network-simple-tls, network-uri - , optparse-applicative, primitive, QuickCheck, quickcheck-instances + , data-default-class, data-interval, deriving-aeson, directory + , extra, filepath, foldl, hspec, hspec-expectations, hspec-wai + , http-api-data, http-client, http-client-tls, http-media + , http-types, http2, lens, megaparsec, memory, network + , network-simple-tls, network-uri, optparse-applicative, primitive + , QuickCheck, quickcheck-classes, quickcheck-instances , safe-exceptions, scientific, serialise, servant, servant-client , servant-docs, servant-js, servant-server, tahoe-chk, temporary , text, tls, unordered-containers, utf8-string, vector, wai @@ -292283,14 +293015,14 @@ self: { }: mkDerivation { pname = "tahoe-great-black-swamp"; - version = "0.3.1.0"; - sha256 = "1317sa6jq4vb5nxd4n6i9h799p3i0ghxl866sfkrppay9pncblzq"; + version = "0.4.0.1"; + sha256 = "1ffm58jv6vfzkjjha5j9wq5w2iz68vp8lk21scdy5z8jnjdzchnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson asn1-encoding asn1-types async base base64 base64-bytestring binary bytestring cborg cborg-json connection containers cryptonite - data-default-class deriving-aeson directory filepath foldl + data-default-class deriving-aeson directory extra filepath foldl http-api-data http-client http-client-tls http-media http-types http2 memory network network-uri primitive safe-exceptions scientific serialise servant-client servant-docs servant-server @@ -292299,16 +293031,18 @@ self: { ]; executableHaskellDepends = [ aeson async base base32 binary bytestring cborg connection - containers deriving-aeson directory filepath foldl http-client - http-client-tls http-types lens megaparsec optparse-applicative - primitive safe-exceptions serialise servant servant-client - servant-js tahoe-chk text unordered-containers vector warp + containers deriving-aeson directory extra filepath foldl + http-client http-client-tls http-types lens megaparsec + optparse-applicative primitive safe-exceptions serialise servant + servant-client servant-js tahoe-chk text unordered-containers + vector warp ]; testHaskellDepends = [ aeson async base base32string base64 binary bytestring cborg - connection containers data-default-class deriving-aeson directory - filepath foldl hspec hspec-expectations hspec-wai http-client - http-types network network-simple-tls primitive QuickCheck + connection containers data-default-class data-interval + deriving-aeson directory extra filepath foldl hspec + hspec-expectations hspec-wai http-client http-types network + network-simple-tls primitive QuickCheck quickcheck-classes quickcheck-instances safe-exceptions serialise servant servant-client temporary text tls unordered-containers vector wai-extra warp warp-tls x509 x509-store yaml @@ -293789,8 +294523,8 @@ self: { ({ mkDerivation, base, containers, deepseq, papi, stm, tasty }: mkDerivation { pname = "tasty-papi"; - version = "0.1.0.1"; - sha256 = "0qlxdcjr8fv05vaspr4bna5wn28c0l0hn9a4znxcrrqlr1wqb3g8"; + version = "0.1.1.0"; + sha256 = "1cz0jw5a7jrb8i3pfx9qx2lsmv08fpdc3qi8rw8ks4cnwc6ba30i"; libraryHaskellDepends = [ base containers deepseq stm tasty ]; librarySystemDepends = [ papi ]; testHaskellDepends = [ base tasty ]; @@ -293904,31 +294638,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3.1.2"; - sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; - revision = "1"; - editedCabalFile = "1dzw6hvfxrbnfjb9b5ca6adbg3qbdh1rsbji4b3jm0hhgi40gkxr"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - silently stm tagged tasty temporary text transformers - ]; - testHaskellDepends = [ - base directory filepath process silently tasty tasty-hunit - temporary transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_3_1_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, silently, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.3.1.3"; sha256 = "1gg4jkcgc3xiw43bw09shylxgd1rkrynyap17zh0yfzd9jrk3i4v"; libraryHaskellDepends = [ @@ -293942,7 +294651,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -294951,6 +295659,17 @@ self: { mainProgram = "tempered"; }) {}; + "tempgres-client" = callPackage + ({ mkDerivation, base, bytestring, HTTP }: + mkDerivation { + pname = "tempgres-client"; + version = "1.0.0"; + sha256 = "09nivyi2gbsbhwalrzsm5b6934119w2jpj70vf7dgjsqpqkgk403"; + libraryHaskellDepends = [ base bytestring HTTP ]; + description = "Client library for Tempgres"; + license = lib.licenses.bsd2; + }) {}; + "tempi" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -295006,23 +295725,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.9.2"; - sha256 = "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_9_3" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; version = "0.1.9.3"; sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; libraryHaskellDepends = [ base template-haskell ]; description = "Backward-compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -295770,21 +296477,21 @@ self: { ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.1.0.1"; - sha256 = "0fwixvyf80gkj1l8r4v4vrmpilz0f02hqhpx0f93rbwaaadxqrd3"; - revision = "1"; - editedCabalFile = "1k1iyj8rpfxc8amlq26wba998ma8hyayw4bzpmf8vwfwg0mpzb42"; + version = "1.1.0.2"; + sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; }) {}; - "termbox_1_1_0_2" = callPackage + "termbox_2_0_0" = callPackage ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.1.0.2"; - sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; + version = "2.0.0"; + sha256 = "0al0989wkvkm95m3dz78yrv33zgjb89vskwwq9vgnivvnq8iffhs"; + revision = "1"; + editedCabalFile = "0xwap18cxy0w48jhi1mfk15fhihfrjr2wmq1swzqnpmr6b3mpszr"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; @@ -295804,6 +296511,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-banana_2_0_0" = callPackage + ({ mkDerivation, base, reactive-banana, termbox }: + mkDerivation { + pname = "termbox-banana"; + version = "2.0.0"; + sha256 = "1izf90r6idfspi06q3vwjipawpdcz5ag5qw3l45khn7js520rapn"; + revision = "1"; + editedCabalFile = "0yk0kj4hn6gv89vs04n95fbf6hyf05dvhxmfjj7c5235ppnxjd07"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base reactive-banana termbox ]; + description = "termbox + reactive-banana"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-bindings" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -295848,14 +296571,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-bindings-hs_0_1_1" = callPackage + ({ mkDerivation, base, termbox-bindings-c }: + mkDerivation { + pname = "termbox-bindings-hs"; + version = "0.1.1"; + sha256 = "1f50j6z72g5lsdvakxvlsg77iqspcm2qmwyc1csafgs1zn40ks2i"; + libraryHaskellDepends = [ base termbox-bindings-c ]; + description = "termbox bindings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-tea" = callPackage ({ mkDerivation, base, ki, termbox }: mkDerivation { pname = "termbox-tea"; - version = "0.1.0"; - sha256 = "0qck27chphmxm5zdrbz3njix5vkry5c5liybgvrx0745ymcd231w"; - revision = "1"; - editedCabalFile = "0sa211vp9acfjl4mlvfinacmhydby6i8ac1nw511vflkbvvy8zd1"; + version = "0.1.0.1"; + sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki termbox ]; @@ -295863,12 +296596,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "termbox-tea_0_1_0_1" = callPackage + "termbox-tea_1_0_0" = callPackage ({ mkDerivation, base, ki, termbox }: mkDerivation { pname = "termbox-tea"; - version = "0.1.0.1"; - sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; + version = "1.0.0"; + sha256 = "0wya0fkjialv7hs6iw230x5ryx79s12pwig28mwrvgzvxmgm383a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki termbox ]; @@ -296938,8 +297671,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8.3"; - sha256 = "0lmzvh0izx192h1gik9vfs24xp13mpw2bwagmdd57sr7gpyln9zp"; + version = "0.12.8.4"; + sha256 = "1pkilvc2v1s5h6kxshwwkgjzm6f5dzya30rfpxg09zsrqpffjlzv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -297142,14 +297875,14 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder_0_6_7_1" = callPackage + "text-builder_0_6_7_2" = callPackage ({ mkDerivation, base, bytestring, criterion, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, text-builder-dev }: mkDerivation { pname = "text-builder"; - version = "0.6.7.1"; - sha256 = "1x2k1mwwwjbyc56c9dm454k24imwq17dym5pfbj33iqn9i4n7ki3"; + version = "0.6.7.2"; + sha256 = "1pf76n2prwba1awgz5328zarpclazl81lii5w9hy7frkd43z7531"; libraryHaskellDepends = [ base bytestring text text-builder-dev ]; testHaskellDepends = [ rerebase tasty tasty-hunit tasty-quickcheck @@ -297182,7 +297915,7 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder-dev_0_3_4_1" = callPackage + "text-builder-dev_0_3_4_2" = callPackage ({ mkDerivation, base, base-compat, bytestring, criterion , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes , quickcheck-instances, rerebase, split, tasty, tasty-hunit @@ -297190,8 +297923,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.4.1"; - sha256 = "095kqq7wwnabfyj6380xy94a0v0d76mkwspdw8lj2m4ykq23agw1"; + version = "0.3.4.2"; + sha256 = "0q0wv1b1v5c54yabqd89h5a6rsx9q9k8scmrxgi2d2m94dggzz9n"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class QuickCheck quickcheck-instances split text time transformers @@ -297302,10 +298035,8 @@ self: { }: mkDerivation { pname = "text-display"; - version = "0.0.5.0"; - sha256 = "03v9alzpmsb2mvpyvch77qg13cdb8iqwf6fv736dzjsb5wwvx7sh"; - revision = "1"; - editedCabalFile = "0jrzqgz1gicjssjw2sg8v8i70z77vnh1w4pj39470rlijrjmxx7p"; + version = "0.0.5.1"; + sha256 = "13r2fwr8q5glajc9gwrxd59kx945cqhxqml3dcwzfrmc6a7gr18q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -297630,8 +298361,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "2"; - editedCabalFile = "0h146i2dvv21nc5z1x9a5a9c2v5ml2kvd10krd5p5aaqpng6i1g4"; + revision = "3"; + editedCabalFile = "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -299082,17 +299813,15 @@ self: { }) {}; "theatre-dev" = callPackage - ({ mkDerivation, async, base, contravariant, hspec, rerebase, stm - , unagi-chan, vector + ({ mkDerivation, async, base, contravariant, hspec, QuickCheck + , rerebase, stm, uuid, vector }: mkDerivation { pname = "theatre-dev"; - version = "0.0.1"; - sha256 = "0mvgbp5ba23gcjykki8x7wsdmdzqknm82rshf10rk9rc120jg5f6"; - libraryHaskellDepends = [ - async base contravariant stm unagi-chan vector - ]; - testHaskellDepends = [ hspec rerebase ]; + version = "0.5.0.1"; + sha256 = "139yfrad3n70mkhf4567ddlmgd8nyis7parzgkp7vmbhwa70fglm"; + libraryHaskellDepends = [ base contravariant stm uuid vector ]; + testHaskellDepends = [ async hspec QuickCheck rerebase ]; description = "Minimalistic actor library experiments"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299627,8 +300356,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.0"; sha256 = "08jqa01pp6b300ic0xcn687i0a0kvz76bgym3dchk9n75m6hvc4f"; - revision = "2"; - editedCabalFile = "1jbi3njiyrcykcx8nnz43a7yzh1ad5aigd7ww04vhi8vp3gasbv6"; + revision = "3"; + editedCabalFile = "0vciaszq8kmcdxzhjy7l7w4mmhkvq9pnkyrz9i1ixxg4l2riw4f5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -301136,8 +301865,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "timestats"; - version = "0.1.0"; - sha256 = "1vmrmvfa3lnyqndqs2y61y4c6xh6ql6x9n86i5yzwayfp2hzrfjb"; + version = "0.1.1"; + sha256 = "1yrr6a0p83h2y2n36x65qz937y9dyzvff1q5zfcskyja43jpaimp"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "A library for profiling time in Haskell applications"; @@ -301753,8 +302482,8 @@ self: { }: mkDerivation { pname = "tlex"; - version = "0.4.0.0"; - sha256 = "0pwjgi2l1q5q61s7xvvfn1z4l4jwvxvsqm22lmqsdmav4j9asnsi"; + version = "0.5.0.0"; + sha256 = "0zgsn8vc5jdy5zjz6fzj68bsm5cm83adk9xjr3s2a04m0b4c6nyr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers enummapset tlex-core ]; testHaskellDepends = [ @@ -301795,8 +302524,8 @@ self: { }: mkDerivation { pname = "tlex-debug"; - version = "0.4.0.0"; - sha256 = "0ssvhqcgv3gxbzjldx13rg2h31vcbk57nlagvw2rb562kagw9dqb"; + version = "0.4.1.0"; + sha256 = "0q07i3l6fmlqwlnf3cmyipd3ybm94iwk8sx0j402fxcxj5fnkdy1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers enummapset tlex tlex-core unordered-containers @@ -301817,8 +302546,8 @@ self: { }: mkDerivation { pname = "tlex-encoding"; - version = "0.4.0.0"; - sha256 = "08wqky2ccmhajb8dcc3nxgrbw6q5jikz5cihz7scc8cn6s49drcz"; + version = "0.4.1.0"; + sha256 = "0ljr66vgm12wksn4xsv27958pi75s3xz2dz16n3r7gfpq9r48diw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base charset containers enummapset tlex tlex-core @@ -301839,8 +302568,8 @@ self: { }: mkDerivation { pname = "tlex-th"; - version = "0.4.1.0"; - sha256 = "1dy7q0kfk02h9cf31mv30q3r31sl9yqrlmd23vc3f545c0q6hpxs"; + version = "0.4.2.0"; + sha256 = "1yw2b26n25xn545yi9n9p3sisdj93vr6r80x6p0h5bsx10v1dsad"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset ghc-prim template-haskell tlex @@ -302818,8 +303547,8 @@ self: { pname = "tomland"; version = "1.3.3.2"; sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "1"; - editedCabalFile = "03gnkws6yggkjn4kh8m1aah51a9lg2p25l9bl51cq54hmpcq51ni"; + revision = "2"; + editedCabalFile = "03xx2wqwyp11yxdnlwxi110wkm6shwpfgzdnzjwdw6cqijdc6zc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -305190,8 +305919,8 @@ self: { pname = "trial"; version = "0.0.0.0"; sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; - revision = "2"; - editedCabalFile = "1w98141cgwrik37hz35vkyf5x4p230863axp6mf6rnrlf7gayikr"; + revision = "3"; + editedCabalFile = "1ny7j9m0y6ry298032f2hnibxv961x86p93g8bl0qzyxhls3zngb"; libraryHaskellDepends = [ base colourista dlist ]; testHaskellDepends = [ base dlist doctest hedgehog hspec hspec-hedgehog splitmix @@ -305206,8 +305935,8 @@ self: { pname = "trial-optparse-applicative"; version = "0.0.0.0"; sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; - revision = "1"; - editedCabalFile = "0g05gi4b3c7ghyih83wq4icavg51p1bjx75i1g9nnx1cy4j82m4j"; + revision = "2"; + editedCabalFile = "0f1azyhbj2816aylcfp0jcm3k9j5xhxskg6pabxx8j9886zqv1zf"; libraryHaskellDepends = [ base optparse-applicative trial ]; description = "Trial helper functions for optparse-applicative"; license = lib.licenses.mpl20; @@ -305219,8 +305948,8 @@ self: { pname = "trial-tomland"; version = "0.0.0.0"; sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; - revision = "2"; - editedCabalFile = "1ssvwzqcz5vmvlrmxl6akcfpkr15inra3hdjfm1pg50gcri3mxkp"; + revision = "3"; + editedCabalFile = "0xz9gp83c1h3l8gzkbwn2lwdaxyf59l71kv69anzrp73jhzmq361"; libraryHaskellDepends = [ base text tomland trial ]; description = "Trial helper functions for tomland"; license = lib.licenses.mpl20; @@ -306409,6 +307138,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; + revision = "1"; + editedCabalFile = "0bgd9mf1z96iqwv2cdc0pj4dy3dnfxj8qsbvjm26h54cvazc2sbl"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -308643,6 +309374,8 @@ self: { pname = "typograffiti"; version = "0.2.0.1"; sha256 = "1avvnf1jsl7l3f7jbp0pnj5f4yhgacklciwvq2acbqb0cmr624rx"; + revision = "1"; + editedCabalFile = "1kcfxkxhva215mcmgk6wfnkqi6f3a56372jccfasg876s557ag6q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308769,8 +309502,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.3.2.0"; - sha256 = "00cg8p2isb40yzfh63qrr7rshv43cp0bpsn753glbxz49qmspy0x"; + version = "0.3.2.1"; + sha256 = "0if1ig1ha65jp1l1v6bn5ljaa3n688hyfkq65dypj5s3nwfr0skm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310271,8 +311004,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0.1"; sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j"; - revision = "3"; - editedCabalFile = "1hx6v04g4g1d8y8nm26k7vkhgfqmcch5xhvljlz67grw0j5d1zxd"; + revision = "4"; + editedCabalFile = "16d6l9ybs2wdwxdf3xfs25pzkkf3svflsn6ncvg86yky4x50zg29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310659,8 +311392,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "union-color"; - version = "0.1.2.0"; - sha256 = "1412axanb5nqnxra3559nyid5cyrxasdnpv28xq5fgp7x7ykirj2"; + version = "0.1.2.1"; + sha256 = "188pmc32i1c112hph1irdpcf9b1jxc68yydqm2xzdcvyf1xpp0vr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Unify verious color formats"; @@ -311774,8 +312507,8 @@ self: { pname = "unliftio-core"; version = "0.2.1.0"; sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; - revision = "2"; - editedCabalFile = "0g41lab0pysvj35wh8a3fzq5i8wf2i58s851m1wjbjzr31bsjy6b"; + revision = "3"; + editedCabalFile = "1ph6pfz8rj697wg0p8df6l4slj9708l8q951vpxpn3qfn8rhd018"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -313615,8 +314348,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.55"; - sha256 = "1j0k94l1ydwwf2cpw22f8caa99hnw61ni7a0bpdgy7vdxsplzzqc"; + version = "0.9.56"; + sha256 = "0m9svb17ppsfbmrkq94cr5fvdwaly056j4xmg69rrb16ar38mz3l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal uuagc-cabal ]; @@ -314243,8 +314976,8 @@ self: { pname = "validation-selective"; version = "0.2.0.0"; sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; - revision = "1"; - editedCabalFile = "0m6bvg1z5rxwr2ls8vqizjx3psjm0dvf2vvycwi4shbqn2pgaiz8"; + revision = "2"; + editedCabalFile = "1lzx925znym2jx0qwicx7cv9ixy5qw4r3819sxvgd2yyvs159az1"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -314746,8 +315479,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "4"; - editedCabalFile = "0nmy4c95kss381n38by7li9x1ffgxz1bvyw0dh52xklbi7v144bh"; + revision = "5"; + editedCabalFile = "0piivz1plbr4zvgmvw5qh08zcwpw5pda8z3pzb8nz4h39fr27zwm"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -315036,6 +315769,8 @@ self: { pname = "vec"; version = "0.5"; sha256 = "17r0aq9yby99b4fxwaggdc2czlyh604yskcv2mpzy45sazw0690a"; + revision = "1"; + editedCabalFile = "0ixp1scb1adbb4i9s9zcsby4qckhzsahb5810bq9s5phi954wb8w"; libraryHaskellDepends = [ adjunctions base boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids transformers @@ -315054,8 +315789,8 @@ self: { pname = "vec-lens"; version = "0.4"; sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "3"; - editedCabalFile = "0hnc71d2zhqwi1q2v8lww1mrcs0xd3jw3ky1a63l3g7s6gqfkw1f"; + revision = "4"; + editedCabalFile = "1mh9wswfvcxw7656qqpggykndcpc5jsc5i0wxrnlzyg0ijh22qcs"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -315067,8 +315802,8 @@ self: { pname = "vec-optics"; version = "0.4"; sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "3"; - editedCabalFile = "1z0zzx99pqrg6yyn4qjykk7c8iq82d0yspxzb54wzydp5lrydq7w"; + revision = "4"; + editedCabalFile = "0szgvkhqnn2igjzvm86fbiqpybfjwl5n2dscr614bda6yhqlvk00"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -315363,6 +316098,23 @@ self: { license = lib.licenses.mit; }) {}; + "vector-extras_0_2_8_1" = callPackage + ({ mkDerivation, base, containers, deferred-folds, foldl, hashable + , unordered-containers, vector + }: + mkDerivation { + pname = "vector-extras"; + version = "0.2.8.1"; + sha256 = "0bnjh4c001v6ia6ac40i508jdzfdlccp8v0fhy7ayv4scrvpwip2"; + libraryHaskellDepends = [ + base containers deferred-folds foldl hashable unordered-containers + vector + ]; + description = "Utilities for the \"vector\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-fft" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -316077,8 +316829,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.2"; - sha256 = "06wi1ir0h7jzcjgd1fq17ggjqh8zb3i3nyd79l0kdkjy7x39rysg"; + version = "6.0.3"; + sha256 = "0k7azl5n70yhwkyij73q8iv275arsxh8jj53lwvhndp0bpwxycng"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators template-haskell text @@ -317226,31 +317978,41 @@ self: { license = lib.licenses.bsd3; }) {}; - "vty_5_39" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, blaze-builder - , bytestring, containers, deepseq, directory, filepath, microlens - , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text - , transformers, unix, utf8-string, vector + "vty_6_0" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring, deepseq + , directory, filepath, microlens, microlens-mtl, microlens-th, mtl + , parsec, stm, text, utf8-string, vector }: mkDerivation { pname = "vty"; - version = "5.39"; - sha256 = "0x1j4m9gx8fdw651w6m49f91vjy98qkdxpr614z3nmf4sxzbpzp5"; - isLibrary = true; - isExecutable = true; + version = "6.0"; + sha256 = "0gc57ixmkdkbffzlbj1dda183gwwb6nwz65zsl2jplqwa6airb07"; + revision = "1"; + editedCabalFile = "0r0l1qb97jdd5ygqw5zzvcji2qgzj7mqapn44zi211z3svzy8kiw"; libraryHaskellDepends = [ - ansi-terminal base binary blaze-builder bytestring containers - deepseq directory filepath microlens microlens-mtl microlens-th mtl - parsec stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers directory filepath microlens microlens-mtl mtl + base binary blaze-builder bytestring deepseq directory filepath + microlens microlens-mtl microlens-th mtl parsec stm text + utf8-string vector ]; description = "A simple terminal UI library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; + "vty-crossplatform" = callPackage + ({ mkDerivation, base, vty, vty-unix }: + mkDerivation { + pname = "vty-crossplatform"; + version = "0.2.0.0"; + sha256 = "04ri60dp4gx6ycqhbdz5jd8mcwbwivwqh7fgg2m5vws6kycjma1l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vty vty-unix ]; + description = "Cross-platform support for Vty"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -317325,6 +318087,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "vty-unix" = callPackage + ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring + , containers, deepseq, microlens, microlens-mtl, microlens-th, mtl + , parsec, stm, terminfo, transformers, unix, utf8-string, vector + , vty + }: + mkDerivation { + pname = "vty-unix"; + version = "0.1.0.0"; + sha256 = "158j7hw0ddbvhxrhn3k2ifc2wsw70dq7pj0qwnmh5bkd1fs0iakz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq microlens + microlens-mtl microlens-th mtl parsec stm terminfo transformers + unix utf8-string vector vty + ]; + executableHaskellDepends = [ ansi-terminal base vty ]; + description = "Unix backend for Vty"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "vty-unix-build-width-table"; + broken = true; + }) {}; + + "vty-windows" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers + , deepseq, directory, filepath, microlens, microlens-mtl + , microlens-th, mtl, parsec, stm, transformers, utf8-string, vector + , vty, Win32 + }: + mkDerivation { + pname = "vty-windows"; + version = "0.1.0.3"; + sha256 = "01fwq0mpyxk5nlxkv24bzsr4klg2fpfy8rs124pdssh657aqxaf7"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + microlens microlens-mtl microlens-th mtl parsec stm transformers + utf8-string vector vty Win32 + ]; + description = "Windows backend for Vty"; + license = lib.licenses.bsd3; + platforms = lib.platforms.windows; + }) {}; + "vulkan" = callPackage ({ mkDerivation, base, bytestring, containers, inline-c, tasty , tasty-discover, tasty-hunit, template-haskell, transformers @@ -319740,6 +320547,8 @@ self: { pname = "warp"; version = "3.3.25"; sha256 = "1wa62inv7ai32jb88gr2vjiv1mh8gb96wc521y6mv2w967q1hzga"; + revision = "1"; + editedCabalFile = "1qg5ca56nmgkpzxcq0140yc8d0761hj257n24gf3dfjdj6hzf0pq"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -319762,7 +320571,7 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_3_29" = callPackage + "warp_3_3_30" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -319772,8 +320581,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.29"; - sha256 = "0dpp98in5ns85ix5lvxvbfy5wdpdbmy11bgbfzw69ajxdhcjk4q0"; + version = "3.3.30"; + sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -320064,18 +320873,14 @@ self: { "wave" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec - , hspec-discover, QuickCheck, temporary, transformers + , hspec-discover, QuickCheck, temporary }: mkDerivation { pname = "wave"; - version = "0.2.0"; - sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki"; - revision = "2"; - editedCabalFile = "015zqms9ypqwb2x0yf51pdy63bikqypn3g3s4ng0nnqsl4bcdya9"; + version = "0.2.1"; + sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring cereal containers transformers - ]; + libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck temporary ]; @@ -322308,10 +323113,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.5.0"; - sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "3"; - editedCabalFile = "13qxbck4ia474hlj1244awp2awjn3scppif3p1vwa3i92q6cf37g"; + version = "0.1.6.0"; + sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -322773,6 +323576,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.2.0.3"; + sha256 = "1c5kmxb9y7i1amjb0qn1w4rx7c80f52z976d7id644v9sxp00kfx"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -324644,14 +325467,14 @@ self: { license = lib.licenses.mit; }) {}; - "wuss_2_0_1_4" = callPackage + "wuss_2_0_1_5" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, exceptions , network, websockets }: mkDerivation { pname = "wuss"; - version = "2.0.1.4"; - sha256 = "0hm4rj7mx5zjmg2yr3zq462zw60nqaqrs91k71kgnxhnkcpbszav"; + version = "2.0.1.5"; + sha256 = "1cxl02fmhybk4l6xxrf826nlf7pmnb1xgvd7661xnf1xwz7l23n2"; libraryHaskellDepends = [ base bytestring crypton-connection exceptions network websockets ]; @@ -329280,10 +330103,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.1.1"; - sha256 = "1giac751jkygddf09a1h75dd4qv6kjjw5992447k53m1j398dpbn"; - revision = "1"; - editedCabalFile = "10m6k53idxr968595780v29kv9sjrp5irzv4b4bi10n3dxg85lf3"; + version = "0.7.1.2"; + sha256 = "1v2rcasjlh4wkqcas652wvs7z8n38cda4yzp18s07f01z0r8ra0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -329296,6 +330117,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-oauth2_0_7_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, mtl, safe-exceptions, text, transformers, unliftio + , uri-bytestring, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.7.1.3"; + sha256 = "151is1lvhnl3pvp0q4sn3i26l4n936vlpky3hndsn1f76cjy489b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + transformers unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-oidc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring , classy-prelude-yesod, containers, cryptonite, http-client @@ -329577,8 +330421,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.5"; - sha256 = "08w8rd69hswj9swi8krbfc063hvnm3vvn5n5vlx025xrgy5jfky2"; + version = "1.6.25.0"; + sha256 = "1n05rs8qn9xpdg9bccxil27zzjzv7gn1x7q8ld3dshwphpr0rpdv"; libraryHaskellDepends = [ aeson attoparsec-aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -332884,8 +333728,8 @@ self: { pname = "zip"; version = "2.0.0"; sha256 = "1j3gwhgcn2j2jsdg4dw7a5y1pw0n273zkfk782pvzjqmccaywbdp"; - revision = "1"; - editedCabalFile = "0cfnwqd2fjlhn2y8srav9s24038amkg3svj1ngs5g1gcljv3rsk8"; + revision = "2"; + editedCabalFile = "15qqk75gd3w4rypwhxlxsq9aaj8iz9wd8pds2si69jsyivn1nrrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -333138,8 +333982,8 @@ self: { pname = "zlib"; version = "0.6.3.0"; sha256 = "1nh4xsm3kgsg76jmkcphvy7hhslg9hx1s75mpsskhi2ksjd9ialy"; - revision = "3"; - editedCabalFile = "0hgh4rn9qinckiiwdnbp9rn0kpc06x18466i713971j03zf8wang"; + revision = "4"; + editedCabalFile = "0v8f3y0isi60c1ldmh5rvl08gjglwaqxs47csl8pi5bimxcpgsqr"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix b/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix index 77e8094277a7..e80371e092e8 100644 --- a/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix +++ b/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "24.0.0"; + version = "23.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc="; + sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch deleted file mode 100644 index 32c0a4cab584..000000000000 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake -similarity index 60% -rename from cmake_modules/FindProtobufAlt.cmake -rename to cmake_modules/FindprotobufAlt.cmake -index 15fe1b4f2..19bdd6291 100644 ---- a/cmake_modules/FindProtobufAlt.cmake -+++ b/cmake_modules/FindprotobufAlt.cmake -@@ -16,24 +16,24 @@ - # under the License. - - if(ARROW_PROTOBUF_USE_SHARED) -- set(Protobuf_USE_STATIC_LIBS OFF) -+ set(protobuf_USE_STATIC_LIBS OFF) - else() -- set(Protobuf_USE_STATIC_LIBS ON) -+ set(protobuf_USE_STATIC_LIBS ON) - endif() - - set(find_package_args) --if(ProtobufAlt_FIND_VERSION) -- list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION}) -+if(protobufAlt_FIND_VERSION) -+ list(APPEND find_package_args ${protobufAlt_FIND_VERSION}) - endif() --if(ProtobufAlt_FIND_QUIETLY) -+if(protobufAlt_FIND_QUIETLY) - list(APPEND find_package_args QUIET) - endif() --find_package(Protobuf ${find_package_args}) --set(ProtobufAlt_FOUND ${Protobuf_FOUND}) --if(ProtobufAlt_FOUND) -- set(ProtobufAlt_VERSION ${Protobuf_VERSION}) -- set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR}) -- set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR}) -- set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH}) -- set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK}) -+find_package(protobuf ${find_package_args} CONFIG) -+set(protobufAlt_FOUND ${protobuf_FOUND}) -+if(protobufAlt_FOUND) -+ set(protobufAlt_VERSION ${protobuf_VERSION}) -+ set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR}) -+ set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR}) -+ set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH}) -+ set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK}) - endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 94f926039..8efc98323 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - opentelemetry-cpp - ORC - re2 -- Protobuf -+ protobuf - RapidJSON - Snappy - Substrait -@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME) - build_opentelemetry() - elseif("${DEPENDENCY_NAME}" STREQUAL "ORC") - build_orc() -- elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf") -+ elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf") - build_protobuf() - elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON") - build_rapidjson() -@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF) - # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If - # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and - # use 23.4. -- resolve_dependency(Protobuf -+ resolve_dependency(protobuf - FORCE_ANY_NEWER_VERSION - TRUE - HAVE_ALT -@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF) - PC_PACKAGE_NAMES - protobuf) - -- if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) -+ if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) - add_definitions(-DPROTOBUF_USE_DLLS) - endif() - -@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF) - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE) - if(NOT STREQUAL "INTERFACE_LIBRARY") -- # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -- message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -+ message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}") - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") -@@ -3986,7 +3986,7 @@ endmacro() - - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.30.0") -- if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE) -+ if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE) - # ARROW-15495: Protobuf/gRPC must come from the same source - message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})") - set(gRPC_SOURCE "${Protobuf_SOURCE}") diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index ddf8db98b39b..4cc55effdaa5 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "13.0.0"; + version = "14.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY="; + hash = "sha256-XHDq+xAR+dEkuvsyiv5U9izFuSgLcIDh49Zo94wOQH4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -115,15 +115,10 @@ stdenv.mkDerivation rec { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.20.0"; - hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; + rev = "v0.27.0"; + hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; }; - patches = [ - # Protobuf switched to lower case project name. - ./cmake-find-protobuf.patch - ]; - nativeBuildInputs = [ cmake ninja diff --git a/nixpkgs/pkgs/development/libraries/clap/default.nix b/nixpkgs/pkgs/development/libraries/clap/default.nix index dd4d410bb874..1da0b31cb10c 100644 --- a/nixpkgs/pkgs/development/libraries/clap/default.nix +++ b/nixpkgs/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; + hash = "sha256-AH3kSCp4Q8Nw3To2vuPuMH/cWm3cmzj2OEH/Azcbdmo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix index 87dbd16d86c4..53265baaf8fe 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.24.0"; + version = "1.25.0"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-VQzXg16rnrghsRY2H3NnGJ+0HEbz8/Num7Xlm9pEqqw="; + sha256 = "sha256-isxV/gTOjVQW3716cr8ZrlLnOn8YWWr6p1SHYlwhdvA="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix b/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix new file mode 100644 index 000000000000..3b24c6f1a2e1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libtiff"; + version = "4.5.1"; + + src = fetchFromGitLab { + owner = "libtiff"; + repo = "libtiff"; + rev = "v${version}"; + hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + }; + + patches = [ + # cf. https://bugzilla.redhat.com/2224974 + (fetchpatch { + name = "CVE-2023-40745.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; + hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; + }) + # cf. https://bugzilla.redhat.com/2224971 + (fetchpatch { + name = "CVE-2023-41175.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; + hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; + }) + # FreeImage needs this patch + ./headers-4.5.patch + # libc++abi 11 has an `#include <version>`, this picks up files name + # `version` in the project's include paths + ./rename-version-4.5.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + # XXX not enabled for now to keep hydra builds running, + # but we have to keep an eye on security updates in supported version + #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 8055704b0890..22b0f8af2043 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { pname = "libtiff"; version = "4.6.0"; + # if you update this, please consider adding patches and/or + # setting `knownVulnerabilities` in libtiff `4.5.nix` + src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch b/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch new file mode 100644 index 000000000000..49af1abb0a54 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch @@ -0,0 +1,16 @@ +export private headers for freeimage +--- i/libtiff/Makefile.am ++++ w/libtiff/Makefile.am +@@ -36,8 +36,12 @@ EXTRA_DIST = \ + tiffconf.h.cmake.in + + libtiffinclude_HEADERS = \ ++ tif_config.h \ ++ tif_dir.h \ ++ tif_hash_set.h \ + tiff.h \ + tiffio.h \ ++ tiffiop.h \ + tiffvers.h + + if HAVE_CXX diff --git a/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch new file mode 100644 index 000000000000..3e93569d4245 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch @@ -0,0 +1,21 @@ +fix case-insensitive build +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ docfiles = \ + README.md \ + RELEASE-DATE \ + TODO \ +- VERSION ++ VERSION.txt + + EXTRA_DIST = \ + cmake \ +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) ++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + + pkgconfigdir = $(libdir)/pkgconfig diff --git a/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch b/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch index 30f39a7a3f50..bdb3063acec4 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch +++ b/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch @@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c453d23e..66b4aa24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -478,6 +478,8 @@ if(NCNN_VULKAN) - - find_package(Threads) - -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") +@@ -560,6 +560,8 @@ if(NCNN_VULKAN) + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") + set(NCNN_SYSTEM_GLSLANG OFF) + else() ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in index b580fcee..be2becd0 100644 --- a/src/ncnn.pc.in diff --git a/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 0b07fab8668c..69967eae160d 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220729"; + version = "20231027"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; }; patches = [ @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tencent/ncnn"; license = licenses.bsd3; maintainers = with maintainers; [ tilcreator ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix b/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix deleted file mode 100644 index 7abc707540ce..000000000000 --- a/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, base, bytestring, cabal-install-parsers -, Cabal-syntax, containers, directory, fetchgit, filepath -, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty -, regex-applicative -}: -mkDerivation { - pname = "changelog-d"; - version = "0.1"; - src = fetchgit { - url = "https://codeberg.org/fgaz/changelog-d"; - sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; - rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; - fetchSubmodules = true; - }; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cabal-install-parsers Cabal-syntax containers - directory filepath generic-lens-lite mtl parsec pretty - regex-applicative - ]; - executableHaskellDepends = [ - base bytestring Cabal-syntax directory filepath - optparse-applicative - ]; - doHaddock = false; - description = "Concatenate changelog entries into a single one"; - license = lib.licenses.gpl3Plus; - mainProgram = "changelog-d"; -} diff --git a/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix b/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix index e4ba565808cf..7abc707540ce 100644 --- a/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix @@ -1,51 +1,30 @@ -{ callPackage -, lib -, pkgs +{ mkDerivation, base, bytestring, cabal-install-parsers +, Cabal-syntax, containers, directory, fetchgit, filepath +, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty +, regex-applicative }: - -(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: { - - version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; - - passthru.updateScript = lib.getExe (pkgs.writeShellApplication { - name = "update-changelog-d"; - runtimeInputs = [ - pkgs.cabal2nix - ]; - text = '' - cd pkgs/development/misc/haskell/changelog-d - cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix - ''; - }); - passthru.tests = { - basic = pkgs.runCommand "changelog-d-basic-test" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - } '' - mkdir changelogs - cat > changelogs/config <<EOF - organization: NixOS - repository: boondoggle - EOF - cat > changelogs/a <<EOF - synopsis: Support numbers with incrementing base-10 digits - issues: #1234 - description: { - This didn't work before. - } - EOF - changelog-d changelogs >$out - cat -n $out - echo Checking the generated output - set -x - grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null - grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null - set +x - ''; +mkDerivation { + pname = "changelog-d"; + version = "0.1"; + src = fetchgit { + url = "https://codeberg.org/fgaz/changelog-d"; + sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; + rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; + fetchSubmodules = true; }; - - meta = oldAttrs.meta // { - homepage = "https://codeberg.org/fgaz/changelog-d"; - maintainers = [ lib.maintainers.roberth ]; - }; - -}) + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cabal-install-parsers Cabal-syntax containers + directory filepath generic-lens-lite mtl parsec pretty + regex-applicative + ]; + executableHaskellDepends = [ + base bytestring Cabal-syntax directory filepath + optparse-applicative + ]; + doHaddock = false; + description = "Concatenate changelog entries into a single one"; + license = lib.licenses.gpl3Plus; + mainProgram = "changelog-d"; +} diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix deleted file mode 100644 index 0197bf21927f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pythonOlder -, pyserial -, click -, ecdsa -, behave -, nose -}: - -buildPythonPackage rec { - pname = "adafruit-nrfutil"; - version = "1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "adafruit"; - repo = "Adafruit_nRF52_nrfutil"; - rev = "refs/tags/appveyor-test-release-${version}"; - hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; - }; - - patches = [ - # Pull a patch which fixes the tests, but is not yet released in a new version: - # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38 - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; - }) - ]; - - propagatedBuildInputs = [ - pyserial - click - ecdsa - ]; - - nativeCheckInputs = [ - behave - nose - ]; - - preCheck = '' - mkdir test-reports - ''; - - pythonImportsCheck = [ - "nordicsemi" - ]; - - meta = with lib; { - homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; - description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; - license = licenses.bsd3; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 17d09d6525fa..b22090a7593d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.5.3"; + version = "18.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k4CqpvmsKBO42oLkzogfm0ALenxRJnngdgxt1HK5i+Q="; + hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 00e01ba80bf1..2c3bd96fcf22 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "25"; + version = "26"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fhq6XUt5CYz/l+Lf9WcCnt9rs3byMQIQs7hFexr2tjM="; + hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix index e6f41525795b..70f1b5589d91 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.7.3"; + version = "12.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDVzLTLT9mQ3eWYZM4CzDkv99rR2dHhDVExaXyE1VYk="; + hash = "sha256-mHwAjOv6d+Xh6mwKhVK6w3Rsh3HgijntkvEmRqOrYRk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blis/default.nix b/nixpkgs/pkgs/development/python-modules/blis/default.nix index 53cd8b17d9cf..91e443af460f 100644 --- a/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -1,32 +1,42 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , cython , hypothesis , numpy -, pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "blis"; - version = "0.7.9"; - format = "setuptools"; + version = "0.7.11"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; + src = fetchFromGitHub { + owner = "explosion"; + repo = "cython-blis"; + rev = "refs/tags/v${version}"; + hash = "sha256-p8pzGZc5OiiGTvXULDgzsBC3jIhovTKUq3RtPnQ/+to="; }; postPatch = '' # See https://github.com/numpy/numpy/issues/21079 + # has no functional difference as the name is only used in log output substituteInPlace blis/benchmark.py \ - --replace "numpy.__config__.blas_ilp64_opt_info" "numpy.__config__.blas_opt_info" + --replace 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' + ''; + + preCheck = '' + # remove src module, so tests use the installed module instead + rm -rf ./blis ''; nativeBuildInputs = [ + setuptools cython ]; @@ -36,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest + pytestCheckHook ]; pythonImportsCheck = [ @@ -53,6 +63,6 @@ buildPythonPackage rec { description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 8f1da6914af7..0a21a0b84fc8 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.21.2"; + version = "2.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2RLf2HBkb/vwbr9JecQQfO68ifVgcBIwmRQkXGJh0Fs="; + hash = "sha256-7T6aR1qCJm7m0AmASyJZpZtc+yXqULKc9mMcY2WYT6I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 2c8ea267210f..57487bbb7ad4 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.30.0"; + version = "3.30.1"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZAOuXK1snsDZETnpyyDZT65ZWu47Qxtv7l8Blqg2Qtw="; + hash = "sha256-UFAqcO6SG/1ufzylrNuOpJaH2hlIo0ZkSLEfxi8OqLw="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index 73d377e78b15..9a5e3b53d94c 100644 --- a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.4"; + version = "0.19.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw="; + hash = "sha256-Gxza9bVLVVHejKNI9CQZQxfJuT71LBsxDQ8e4xAozS0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/floret/default.nix b/nixpkgs/pkgs/development/python-modules/floret/default.nix index 08f59292a206..72248cf8dbaa 100644 --- a/nixpkgs/pkgs/development/python-modules/floret/default.nix +++ b/nixpkgs/pkgs/development/python-modules/floret/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "floret"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "floret"; rev = "refs/tags/v${version}"; - hash = "sha256-cOVyvRwprR7SvZjH4rtDK8uifv6+JGyRR7XYzOP5NLk="; + hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/imgtool/default.nix b/nixpkgs/pkgs/development/python-modules/imgtool/default.nix index 88ceeb233706..54bd8026d9a6 100644 --- a/nixpkgs/pkgs/development/python-modules/imgtool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imgtool/default.nix @@ -7,18 +7,19 @@ , click , cryptography , intelhex +, pyyaml }: buildPythonPackage rec { pname = "imgtool"; - version = "1.10.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A7NOdZNKw9lufEK2vK8Rzq9PRT98bybBfXJr0YMQS0A="; + hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { click cryptography intelhex + pyyaml ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index f2fb806f4750..cdab3aac8ff4 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-FJHfgmz8UXjIDz6J3W37po5ITvM024EHDrXLgJSzEWc="; + hash = "sha256-C7LieGRNEd6mJywXl0o9u5aIqUnzu2CutbeRMpxE+tw="; }; propagatedBuildInputs = [ @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Messaging library for Python"; homepage = "https://github.com/celery/kombu"; - changelog = "https://github.com/celery/kombu/releases/tag/v${version}"; + changelog = "https://github.com/celery/kombu/blob/v${version}/Changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/libpcap/default.nix b/nixpkgs/pkgs/development/python-modules/libpcap/default.nix index 1dbc2de90dfb..d094e7715fca 100644 --- a/nixpkgs/pkgs/development/python-modules/libpcap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libpcap/default.nix @@ -7,7 +7,6 @@ , pkgsLibpcap , pkg-about , setuptools -, tox }: buildPythonPackage rec { @@ -25,10 +24,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - tox ]; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml cat <<EOF >src/libpcap/libpcap.cfg [libpcap] LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 1612bfac0d96..ac6da73af2ab 100644 --- a/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -9,22 +9,27 @@ , pytest-error-for-skips , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nettigo-air-monitor"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aqipy-atmotech diff --git a/nixpkgs/pkgs/development/python-modules/ocifs/default.nix b/nixpkgs/pkgs/development/python-modules/ocifs/default.nix index 6d44c1a9ad3a..479f2c839648 100644 --- a/nixpkgs/pkgs/development/python-modules/ocifs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ocifs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , fsspec , oci , pythonOlder @@ -8,18 +9,22 @@ buildPythonPackage rec { pname = "ocifs"; - version = "1.2.1"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "oracle"; - repo = pname; + repo = "ocifs"; rev = "refs/tags/${version}"; - hash = "sha256-HY2LTm3JckAzNMVuAJNs/0LixBwiG/QKa7ILquY0Q+c="; + hash = "sha256-ugNITi2tSf3lhbASgr6ErmFDYinQjnhmtRjV3YL7F9U="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fsspec oci @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; + changelog = "https://github.com/oracle/ocifs/releases/tag/${version}"; license = with licenses; [ upl ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix index b82712dc443f..2c1e92c75d84 100644 --- a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix @@ -7,7 +7,6 @@ , setuptools , packaging , tomli -, tox }: buildPythonPackage rec { @@ -24,10 +23,15 @@ buildPythonPackage rec { hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; }; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily + postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml + ''; + nativeBuildInputs = [ packaging setuptools - tox ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix b/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix index 315d0411b8e9..efee87277cb5 100644 --- a/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pvextractor"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "radio-astro-tools"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HYus2Gk3hzKq+3lJLOJQ+EE6LeO+DrvqLK3NpqrUYeI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ="; }; buildInputs = [ pyqt-builder ]; diff --git a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index 5281701f99e1..32c8b966ad58 100644 --- a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.11.0"; + version = "4.11.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qF8ed380P5HiIdF14VI9AG7vHIEGwQ/S4zgoC6snP6Y="; + hash = "sha256-7hnjX721t0YzKcJ75R+tEfUI6E9bxMYXUEtI56GDZP0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index 15804b2c5b35..1ed718a70032 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-gpY5pfvgciiQF5kDUui5UbxLlZ6X3mSNBNZWfpYD5Sc="; + hash = "sha256-1psTa++qF5WPDVXeDGWfcQ4hGz98uW297QDUKrQyoRE="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index a9393cb48781..c49ffd7bce5d 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , cython , gfortran , git @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s="; }; + patches = [ + # check for openblas64 pkg-config + # remove when patch merged upstream + # https://github.com/has2k1/scikit-misc/pull/29 + (fetchpatch { + name = "openblas64-pkg-config.patch"; + url = "https://github.com/has2k1/scikit-misc/commit/6a140de18e5e1276c7aa08bf0a047b1023aa9ae4.patch"; + hash = "sha256-HzKiRISOvoDIUIcgiYVvxhx9klwyfAh/1DDKq7inl+A="; + }) + ]; + postPatch = '' patchShebangs . diff --git a/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix index 9cf75ab98ca1..86f7c6a7d629 100644 --- a/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-mOtmE1l2yWtO4/TA7wVS67Wpl3zjAoQz23n0c4sCryY="; + hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 93704c953ee8..94011ad5244d 100644 --- a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.208.0"; + version = "0.214.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; + hash = "sha256-5mPVZz/KmrRytGoW5h1vG8pt8+N+jFk2Q22ih+sjcjM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/stringparser/default.nix b/nixpkgs/pkgs/development/python-modules/stringparser/default.nix index bac315950781..44e6d6baa52f 100644 --- a/nixpkgs/pkgs/development/python-modules/stringparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stringparser/default.nix @@ -1,35 +1,50 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pytestCheckHook +, pythonOlder , setuptools , setuptools-scm -, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "stringparser"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hgrecco"; - repo = pname; - rev = version; - sha256 = "sha256-uyeHuH0UfpZqh7sMRI6+fR/Rr2jSzdR+5O/MtzslO5w="; + repo = "stringparser"; + rev = "refs/tags/${version}"; + hash = "sha256-gj0ooeb869JhlB9Mf5nBydiV2thTes8ys+BLJ516iSA="; }; - nativeBuildInputs = [ setuptools setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; - pythonImportsCheck = [ "stringparser" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "stringparser" + ]; meta = with lib; { description = "Easy to use pattern matching and information extraction"; homepage = "https://github.com/hgrecco/stringparser"; + changelog = "https://github.com/hgrecco/stringparser/blob/${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ evilmav ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix index 3c406d07451b..4ce81ade979b 100644 --- a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.12"; + version = "0.19.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-KbJBIVxl622kZPEeIyiTEEky/DxKShyJGSFYv2YEveY="; + hash = "sha256-N0erJxk0FN47IClSt0YiSYH58j9ysQFscSShN7rAD3s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index bac128984bfb..ea7e91719936 100644 --- a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "68.2.0.0"; + version = "68.2.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; + hash = "sha256-jzHoIB55aXieDrI0Y7U+vl9n2SQX30tkim6jw1fKT1E="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index 4083810195a9..e68d0be6ad35 100644 --- a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; - rev = version; - hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A="; + rev = "refs/tags/release-${version}"; + hash = "sha256-bXAQjq7xBYn34tIZF96Sr5jDUii3s4FGkNx65rGKXkY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/weasel/default.nix b/nixpkgs/pkgs/development/python-modules/weasel/default.nix index 6b1ffcb31f52..727ec482c161 100644 --- a/nixpkgs/pkgs/development/python-modules/weasel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weasel/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "weasel"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "weasel"; rev = "refs/tags/v${version}"; - hash = "sha256-I8Omrez1wfAbCmr9hivqKN2fNgnFQRGm8OP7lb7YClk="; + hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/nixpkgs/pkgs/development/python-modules/xdg/default.nix index f44d2e443566..065f434bd7ee 100644 --- a/nixpkgs/pkgs/development/python-modules/xdg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdg/default.nix @@ -1,20 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , clikit , poetry-core -, pytestCheckHook }: buildPythonPackage rec { version = "6.0.0"; pname = "xdg"; - disabled = isPy27; + disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchFromGitHub { - owner = "srstevenson"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; + # the github source uses `xdg_base_dirs`, but pypi's sdist maintains `xdg` for compatibility. + # there are actually breaking changes in xdg_base_dirs, + # and libraries that want to support python 3.9 and below need to use xdg. + src = fetchPypi { + inherit pname version; + hash = "sha256-JCeAlPLUXoRtHrKKLruS17Z/wMq1JJ7jzojJX2SaHJI="; }; nativeBuildInputs = [ poetry-core ]; @@ -23,7 +26,12 @@ buildPythonPackage rec { clikit ]; - nativeCheckInputs = [ pytestCheckHook ]; + # sdist has no tests + doCheck = false; + + pythonImportsCheck = [ + "xdg" + ]; meta = with lib; { description = "XDG Base Directory Specification for Python"; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index fe89b0c791e3..69797da5af87 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk="; + hash = "sha256-6NeReekizEBRfsiRBshBD5WrGJpDdNpvvC7jslpsQoI="; }; - vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ="; + vendorHash = "sha256-r3IuE5qdN3B9IZyRjLokaRZ99Ziypbfg4H/uiMzSB+w="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 1cc99e2aeaac..af5aba306906 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mIXsPj804jxDd8+jPH8tWnnUj7dXIRwfKTeT4WDWb5c="; + hash = "sha256-YaWe+WjQXe0IQhIRSD2B0CMPOIsJT9fmqFrFwLtpTQ0="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/nixpkgs/pkgs/development/tools/espup/default.nix b/nixpkgs/pkgs/development/tools/espup/default.nix index c5089bc2d7f3..d1d48796909e 100644 --- a/nixpkgs/pkgs/development/tools/espup/default.nix +++ b/nixpkgs/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-D5ck96nR8agiYf1t6ViOaEWws9AQ0EBZ48YKp68jfRA="; + hash = "sha256-CNEfqrysSETTJzhVl45Aip04QRxE9Kbqalu6SLQ16i4="; }; - cargoHash = "sha256-mKpAGS6Rxoq2v/VW0AncVx/9BjvG7wM8ePTR+661e5U="; + cargoHash = "sha256-9eQm2+p8eXrfbvdjfqQrbQ4oprNJL8rO88gafBe8/RQ="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/graphql-client/default.nix b/nixpkgs/pkgs/development/tools/graphql-client/default.nix index b98f287d612d..b41a7a02bdc6 100644 --- a/nixpkgs/pkgs/development/tools/graphql-client/default.nix +++ b/nixpkgs/pkgs/development/tools/graphql-client/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "graphql-client"; - version = "0.10.0"; + version = "0.13.0"; src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - sha256 = "sha256-OV4kpvciEJOGfhkxPoNf1QmhdytWMhXuQAKOFJvDFA4="; + sha256 = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; - cargoSha256 = "sha256-r/pRwDLc/yGMzdZIx8SV46o63eb6qrlTb6MsUBhq97w="; + cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/jaq/default.nix b/nixpkgs/pkgs/development/tools/jaq/default.nix index b3a23a28f731..ae7c6b35bd7b 100644 --- a/nixpkgs/pkgs/development/tools/jaq/default.nix +++ b/nixpkgs/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-Wz10goMJYWbFak4v10W6ez+z+T+ohG06HU+rS8AXQqg="; + hash = "sha256-Jc/etdQtJfFmmdxWdJUVQqPjHTCY6ZUAO+ShNJboOq0="; }; - cargoHash = "sha256-fvuwn5pA33QE4YplG5VAkHF1MgwRni0nbA6B2JkNndU="; + cargoHash = "sha256-TaWD9xpTsNWQt/Wz5PYY0mgFfP5d/Jn3EhcHUywUk3Q="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix b/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix index 6085ec71a08d..c7bf7da64d24 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; + hash = "sha256-hcicI5ka6m0W2Sj8IaxNsLfIc97eR8SKKp81mJvM2GM="; }; modRoot = "gopls"; - vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; + vendorHash = "sha256-jjUTRLRySRy3sfUDfg7cXRiDHk1GWHijgEA5XjS+9Xo="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index c6eec2aff591..e0f9b6811d9b 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { -e '/cxx_/s,$cc,clang++,' ''; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/astyle/default.nix b/nixpkgs/pkgs/development/tools/misc/astyle/default.nix index 66e972826cb9..315a21360951 100644 --- a/nixpkgs/pkgs/development/tools/misc/astyle/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/astyle/default.nix @@ -2,25 +2,20 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.1"; + version = "3.4.10"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz"; - sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + hash = "sha256-b2fshytDe9PFHg914RLk2/2ybV+3vZz4pIDxCvVVcGM="; }; - # lots of hardcoded references to /usr - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace ' /usr/' " $out/" - ''; - nativeBuildInputs = [ cmake ]; meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; + maintainers = with maintainers; [ carlossless ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 85cc7fbc8335..ff02a02fa702 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.22.0"; + version = "2.23.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "HvNf6yB6+ljTVJXV3l5Jr1/HTR8tmofgJ4fDPbM2k3M="; + sha256 = "g92AUmrfu+naLUo11u0fqJKPRiY2nSIUAqZY4D6ti0I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "LvEUPcArVJV1sFFgvflzCQPyhl/q7cXqdwdvN9AsBho="; + sha256 = "l8KwAvD8tWiVNYCp9HikBDPSr+8iYhp5svdTkhitxy0="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "48Twr/zkJVS3uSiAX0/FL7EDtbE9ZHKoQ+otzRo1w9A="; + sha256 = "Ffg2kwg/jOMwEHujfb0x4tjc6PLPswVi3EWm+u/o5wc="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "k8YnRzSc6RuwBcJcRpjwZevCh2Tc9/j7BetivrMc1mM="; + sha256 = "yywxgvzK7BKzYsiElYLy8M80RKIp6ksNv0wq4QzRyfY="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "PTSggxBfWtIXj8DX2bLmKXlFXWBE7q8FfYww4SCvWh0="; + sha256 = "4o34UR411nokdvpSMhbdrL9D4r4ZqoS7pwDEj153GZg="; }; }; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 02355cb9846c..d0308f31f7ee 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper -, rresult, bos, ocaml_pcre, re, camlp-streams +, rresult, bos, re, camlp-streams , legacy ? false }: @@ -10,26 +10,19 @@ else let params = if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { - version = "8.00.05"; + version = "8.02.01"; src = fetchFromGitHub { owner = "camlp5"; repo = "camlp5"; rev = version; - hash = "sha256-Havr3RB6iUP7QzV+LUGwMHtGzmRdS5RqYsqJ0N5w6gE="; + hash = "sha256-qSA2559vqWLU+0ns7LPUGI2K5f8sfu+QQ0sCH8sR6To="; }; nativeBuildInputs = [ makeWrapper ocaml findlib perl ]; - buildInputs = [ bos ocaml_pcre re rresult ]; + buildInputs = [ bos re rresult ]; propagatedBuildInputs = [ camlp-streams ]; - postFixup = '' - for p in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5 - do - wrapProgram $out/bin/$p \ - --suffix CAML_LD_LIBRARY_PATH : ${ocaml_pcre}/lib/ocaml/${ocaml.version}/site-lib/stublibs - done - ''; } else rec { version = "7.14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/oxlint/default.nix b/nixpkgs/pkgs/development/tools/oxlint/default.nix index 48c7cbba5679..649b49a09850 100644 --- a/nixpkgs/pkgs/development/tools/oxlint/default.nix +++ b/nixpkgs/pkgs/development/tools/oxlint/default.nix @@ -1,24 +1,27 @@ { lib , rustPlatform , fetchFromGitHub +, rust-jemalloc-sys , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-zjTJF8yU3Hb8CTzzsPdo2EJI7QriEsjUyXVwprb22xQ="; + hash = "sha256-s+D9+gHJLldTaMHr+XahppNHYL62V1J9iOgRZkr/p9Q="; }; - cargoHash = "sha256-mRmoCH0VVO9LhFfEd4VfDbCfl5VCpcIKBkaNzU0+9SU="; + cargoHash = "sha256-NQ/s39x/LLQoiW7p2x65l1oBkDal46g5/G6r4Ttpgsw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/development/tools/pandoc/default.nix b/nixpkgs/pkgs/development/tools/pandoc/default.nix index c8c553afad6e..cbbb026b8336 100644 --- a/nixpkgs/pkgs/development/tools/pandoc/default.nix +++ b/nixpkgs/pkgs/development/tools/pandoc/default.nix @@ -34,7 +34,7 @@ in -t ${haskellPackages.warp} \ $out/bin/pandoc remove-references-to \ - -t ${haskellPackages.pandoc_3_1_8} \ + -t ${haskellPackages.pandoc_3_1_9} \ $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions @@ -48,5 +48,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_9 ]; }) diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 74b5a5dd3a4d..8613b15aa5ca 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-OVtSvlmMRngxhUeq4u+exVc7WQUqBnksDpb8esbly9Y="; + hash = "sha256-zCivxYHhaVqzPe3qBUKXgMgEE6niGqkHJM77rfEUoFo="; }; - cargoHash = "sha256-3OuyN+nm2t+LH8lue3xYoBQp7OYjzhDbnc2LCGqFJgY="; + cargoHash = "sha256-O8X+oLKhKeQGeUrsRVeakZjaMKPiXdIns48rV8Q9JA8="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix index 295ac413fe3e..b87d9d4570b6 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix @@ -31,6 +31,12 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.isDarwin Security; + preCheck = lib.optionalString stdenv.isDarwin '' + # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } + # https://github.com/google/cargo-raze/issues/544 + ulimit -n 1024 + ''; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 0cf07a9c29cb..d5ad729050ce 100644 --- a/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.87.2"; + version = "0.87.4"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-EZSVKmOIzwokCKreLnZj4DWEhjjXo3TFhieGVR7w7NM="; + hash = "sha256-e5HuDWMmikTlWC2ezZ5zxxKYFlgz9jrpHtNfIwSiiok="; }; - vendorHash = "sha256-3IV0MgDe71lqLQ6tB2NM2kYokXGWvR+hh4lvxw5QWjA="; + vendorHash = "sha256-EcWhpx93n+FzkXDOHwAxhn13qR4n9jLFeaKoe49x1x4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/games/ddnet/default.nix b/nixpkgs/pkgs/games/ddnet/default.nix index b8e333cd79c2..98da304c85ab 100644 --- a/nixpkgs/pkgs/games/ddnet/default.nix +++ b/nixpkgs/pkgs/games/ddnet/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.3"; + version = "17.4"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; + hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; + hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/games/moon-buggy/default.nix b/nixpkgs/pkgs/games/moon-buggy/default.nix index 12eb6b24a806..87e089eb9571 100644 --- a/nixpkgs/pkgs/games/moon-buggy/default.nix +++ b/nixpkgs/pkgs/games/moon-buggy/default.nix @@ -1,5 +1,8 @@ -{lib, stdenv, fetchurl, ncurses}: - +{ lib +, stdenv +, fetchurl +, ncurses +}: stdenv.mkDerivation rec { pname = "moon-buggy"; version = "1.0.51"; @@ -16,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple character graphics game where you drive some kind of car across the moon's surface"; license = lib.licenses.gpl2; - maintainers = [lib.maintainers.rybern]; - platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rybern ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/nixpkgs/pkgs/games/osu-lazer/bin.nix b/nixpkgs/pkgs/games/osu-lazer/bin.nix index eccc2146d28b..95dadfee693f 100644 --- a/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.1026.0"; + version = "2023.1114.1"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; + sha256 = "sha256-MQkHbodSkAQQpjaBP+Q35afcCrgcie6UoUldc+vjRA0="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; + sha256 = "sha256-40ylXbn9jV9v+ve1hFwhT5/jhzNfWHjL2WIplVUD2qk="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; + sha256 = "sha256-Q2z2Js0Zc9nvyQNxzLuuV7TcwiNIRo+RMRER6ZYgh74="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix index 5cf92a41a6f8..d9a2b378134a 100644 --- a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, fetchpatch, stdenv }: stdenv.mkDerivation { pname = "core-symbolication"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; + patches = [ + # C99 compilation fix + # https://github.com/matthewbauer/CoreSymbolication/pull/1 + (fetchpatch { + url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; + hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix index a6795c3fd5e7..0625985c908f 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , kernel , nvidia_x11 , hash @@ -18,6 +19,13 @@ stdenv.mkDerivation ({ inherit hash; }; + patches = lib.optionals (nvidia_x11.version == "545.29.02")[ + (fetchpatch { + url = "https://github.com/NVIDIA/open-gpu-kernel-modules/files/13310810/0001-nvkms-initialize-brightnessType-in-_BACKLIGHT_BRIGHT.patch.txt"; + hash = "sha256-9N+DbyT4VmGNTHXWf23PJU4YWZS+0JK7yqkmkpnINPk="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/nixpkgs/pkgs/servers/gotosocial/default.nix b/nixpkgs/pkgs/servers/gotosocial/default.nix index f6c86c06312a..5e7de8346726 100644 --- a/nixpkgs/pkgs/servers/gotosocial/default.nix +++ b/nixpkgs/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.11.1"; + version = "0.12.2"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-xPdSwsXjyjodgEHlwl4X32Pb6TniwM9Q+u56xAoY7SQ="; + hash = "sha256-vEjL9pZFBSt32ZqWZGvG112HA5nqkwY6uOQY3hBUWN4="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-qsgrHPQae1+LKF2y6e256ZfYR+a9ffe7oq1W3GJA1do="; + hash = "sha256-ufxedg3SSHqYf5g1GXXSWA0pmb305kpjkjyjwCX126A="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/h2/default.nix b/nixpkgs/pkgs/servers/h2/default.nix index 3ec3c396a7e8..84a8b98b6dfc 100644 --- a/nixpkgs/pkgs/servers/h2/default.nix +++ b/nixpkgs/pkgs/servers/h2/default.nix @@ -1,47 +1,45 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: -stdenv.mkDerivation rec { +{ lib, maven, fetchFromGitHub, jre, makeWrapper, nix-update-script }: + +maven.buildMavenPackage rec { pname = "h2"; - version = "2.2.220"; + version = "2.2.224"; + + outputs = [ "out" "doc" ]; - src = fetchzip { - url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2023-07-04.zip"; - hash = "sha256-nSOkCZuHcy0GR4SRjx524+MLqxJyO1PRkImPOFR1yts="; + src = fetchFromGitHub { + owner = "h2database"; + repo = "h2database"; + rev = "refs/tags/version-${version}"; + hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g="; }; - outputs = [ "out" "doc" ]; + mvnParameters = "-f h2/pom.xml -DskipTests"; + mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; nativeBuildInputs = [ makeWrapper ]; - installPhase = - let - h2ToolScript = '' - #!/usr/bin/env bash - dir=$(dirname "$0") - - if [ -n "$1" ]; then - ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}" - else - echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'" - fi - ''; - in '' - mkdir -p $out $doc/share/doc/ - cp -R bin $out/ - cp -R docs $doc/share/doc/h2 + installPhase = '' + mkdir -p $out/share/java + install -Dm644 h2/target/h2-${version}.jar $out/share/java - echo '${h2ToolScript}' > $out/bin/h2tool.sh + makeWrapper ${jre}/bin/java $out/bin/h2 \ + --add-flags "-cp \"$out/share/java/h2-${version}.jar:\$H2DRIVERS:\$CLASSPATH\" org.h2.tools.Console" - substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java" + mkdir -p $doc/share/doc/h2 + cp -r h2/src/docsrc/* $doc/share/doc/h2 + ''; - chmod +x $out/bin/*.sh - ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^version-([0-9.]+)$" ]; + }; meta = with lib; { description = "The Java SQL database"; - homepage = "http://www.h2database.com/html/main.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + homepage = "https://h2database.com/html/main.html"; + changelog = "https://h2database.com/html/changelog.html"; license = licenses.mpl20; - platforms = lib.platforms.linux; - maintainers = with maintainers; [ mahe ]; + platforms = lib.platforms.unix; + maintainers = with maintainers; [ mahe anthonyroussel ]; + mainProgram = "h2"; }; } diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 1c0de1007962..04485f013993 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -460,7 +460,6 @@ in python.pkgs.buildPythonApplication rec { pytestCheckHook requests-mock respx - stdlib-list syrupy tomli # required through tests/auth/mfa_modules/test_otp.py diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix index 6194548a6a99..4ca4bd75d6b6 100644 --- a/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -124,7 +124,11 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optionals stdenv.isDarwin [ + "-Wno-error=deprecated-declarations" + "-Wno-error=gnu-folding-constant" + "-Wno-error=unused-but-set-variable" + ]); configurePlatforms = []; diff --git a/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix b/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix index 4bca9a37a9ce..5cee9020b8aa 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix +++ b/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "axis2"; - version = "1.7.9"; + version = "1.8.2"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; - sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; + url = "mirror://apache/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; + hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; }; nativeBuildInputs = [ unzip ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + homepage = "https://axis.apache.org/axis2/java/core/"; + changelog = "https://axis.apache.org/axis2/java/core/release-notes/${version}.html"; + maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix index ede01d350d4b..0b1d4115c895 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/default.nix +++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, nixosTests, testers, jre }: let - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; inherit sha256; }; @@ -20,11 +20,19 @@ let mv $out/webapps $webapps/ ''; + passthru.tests = { + inherit (nixosTests) tomcat; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; + }; + }; + meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ anthonyroussel ]; license = [ licenses.asl20 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; @@ -33,13 +41,13 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.75"; - sha256 = "sha256-VWfKg789z+ns1g3hDsCZFYQ+PsdqUEBeBHCihkGZelk="; + versionMinor = "0.82"; + sha256 = "sha256-xvRGXDUkYaHFYacUPg81Xf0xyTbdsc1XP/PmqMR8bQc="; }; tomcat10 = common { versionMajor = "10"; - versionMinor = "0.27"; - sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc="; + versionMinor = "1.15"; + sha256 = "sha256-cqQW3Dc3sC/1zoidMIGDBNw4G5bnxYvhmHz7U7K6Djg="; }; } diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index e7df0fb7190f..c6ae81e77321 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1096"; + version = "0.21.1234"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-j9PQa54Gv6kdCHZ9/WPnKYkxD4N0eu0KtMPpATSYVDo0mP9pXdQxSoCrKdmW2gOveuo5Z/wPW4BB4r3gvFxcOg=="; + hash = "sha512-kI5HxBCx9moxnw90tqRLJ/muULEUOqIGcfWlFmgFwuOsOIoLc3arY1HDjRzeBDLYuz8BiG99lXUeAa5eHB3+Wg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/nixpkgs/pkgs/servers/klipper/simulator.cfg b/nixpkgs/pkgs/servers/klipper/simulator.cfg index 4dc19b1e40ff..6a4122ce3aa5 100644 --- a/nixpkgs/pkgs/servers/klipper/simulator.cfg +++ b/nixpkgs/pkgs/servers/klipper/simulator.cfg @@ -4,8 +4,10 @@ # CONFIG_MACH_ATSAMD is not set # CONFIG_MACH_LPC176X is not set # CONFIG_MACH_STM32 is not set +# CONFIG_MACH_HC32F460 is not set # CONFIG_MACH_RP2040 is not set # CONFIG_MACH_PRU is not set +# CONFIG_MACH_AR100 is not set # CONFIG_MACH_LINUX is not set CONFIG_MACH_SIMU=y CONFIG_BOARD_DIRECTORY="simulator" @@ -16,6 +18,12 @@ CONFIG_SERIAL_BAUD=250000 CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y CONFIG_HAVE_GPIO_SPI=y diff --git a/nixpkgs/pkgs/servers/monitoring/laurel/default.nix b/nixpkgs/pkgs/servers/monitoring/laurel/default.nix index c6761f41383e..9cddb34ffc74 100644 --- a/nixpkgs/pkgs/servers/monitoring/laurel/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "threathunters-io"; repo = pname; - rev = "v${version}"; - hash = "sha256-4SOnBIi45g2hYo+nFLI5soS+qRPzjkSYwmyMfVZCyVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-O1EdIEgg+QfOnnhcTpI1nwYjdLOWcdt90SQegn68AJI="; }; - cargoHash = "sha256-yrk3frsR8AQGDVFgP2fCIWmhw+dTZwvga1hF0IAwzjQ="; + cargoHash = "sha256-wseysbjMkjPgKk7X9PpBck/IuafIFXfbRy+fPfR1CEY="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 90207be3343a..213b2285c5e7 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -13,6 +13,13 @@ buildGoModule rec { vendorHash = "sha256-ER0vK0xYUbQT3bqUosQMFT7HBycb3U8oI4Eak72myzs="; + ldflags = [ "-s" "-w" ]; + + checkFlags = [ + # Disable flaky tests on Darwin + "-skip=TestWholeApp|TestExporter" + ]; + meta = with lib; { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 37814a417491..156bd4a6ec23 100644 --- a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,24 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib +, buildGoModule +, fetchFromGitHub +, go +, nix-update-script +, nixosTests +, testers +, thanos +}: + buildGoModule rec { pname = "thanos"; - version = "0.31.0"; + version = "0.32.5"; src = fetchFromGitHub { - rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-A4bDCyvctHmDBYzvWpeEO4u6KhoICN7BbRQK4aZCbIA="; }; - patches = [ - # https://github.com/thanos-io/thanos/pull/6126 - (fetchpatch { - url = "https://github.com/thanos-io/thanos/commit/a4c218bd690259fc0c78fe67e0739bd33d38541e.patch"; - hash = "sha256-Hxc1s5IXAyw01/o4JvOXuyYuOFy0+cBUv3OkRv4DCXs="; - }) - ]; - - vendorHash = "sha256-8+MUMux6v/O2syVyTx758yUBfJkertzibz6yFB05nWk="; + vendorHash = "sha256-ZjkMvbWq96Rte9WoxAWzeouVA/6mBqanvY9yHr9F5MM="; doCheck = true; @@ -30,12 +31,26 @@ buildGoModule rec { "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) prometheus; + version = testers.testVersion { + command = "thanos --version"; + package = thanos; + }; + }; + }; + meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; + changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; + mainProgram = "thanos"; + maintainers = with maintainers; [ basvandijk anthonyroussel ]; }; } diff --git a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index bb86f5f48c4a..566e3f0802bd 100644 --- a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "nats-streaming-server"; - version = "0.25.5"; + version = "0.25.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-rx6H3YXyg53th81w1SsKg5h9wj2vswnArDO0TNUlvpE="; + sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc="; }; - vendorHash = "sha256-erTxz3YpE64muc9OgP38BrPNH5o3tStSYsCbBd++kFU="; + vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U="; # tests fail and ask to `go install` doCheck = false; diff --git a/nixpkgs/pkgs/servers/pr-tracker/default.nix b/nixpkgs/pkgs/servers/pr-tracker/default.nix index e09043aa767a..33e772041621 100644 --- a/nixpkgs/pkgs/servers/pr-tracker/default.nix +++ b/nixpkgs/pkgs/servers/pr-tracker/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.3.0"; + version = "1.4.0"; src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - hash = "sha256-JetfcA7Pn6nsCxCkgxP4jS6tijx89any/0GrmLa+DR0="; + hash = "sha256-pCT74nAbtULvyS2BQ+XQU3LzF/q05wLaEeSa9j3DoAo="; }; - cargoSha256 = "sha256-QUr0IHmzbhFNd6rBDEX8RZul/d1TLv0t+ySCQYMlpmE="; + cargoHash = "sha256-WFI7eyr7fdQ6ePXQ+n/VrtPQ2eMZpVR68nGRBBlq3JU="; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl systemd ]; diff --git a/nixpkgs/pkgs/servers/roundcube/default.nix b/nixpkgs/pkgs/servers/roundcube/default.nix index a7e71c722fb5..959c9bf4633e 100644 --- a/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; + sha256 = "sha256-Fktyy3jeidEEdB7pCQ9AJOY7+tpDlJA0hENl8/pwtf0="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/nixpkgs/pkgs/servers/soft-serve/default.nix b/nixpkgs/pkgs/servers/soft-serve/default.nix index 5def527fd099..6ee1980f0802 100644 --- a/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-PY/BHfuDRHXpzyUawzZhDr1m0c1tWqawW7GP9muhYAs="; + hash = "sha256-4ckMLne/T0wurcXKBCDqpEycBCt/+nsNdoj83MA4UmY="; }; - vendorHash = "sha256-jtEiikjEOThTSrd+UIEInxQmt2z5YVyksuTC17VmdkA="; + vendorHash = "sha256-t2Ciulzs/7dYFCpiX7bo0hwwImJBkRV2I1aTT2lQm+M="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index ea50fc371981..07c81ec1007c 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -245,36 +245,29 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.22"; - hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; + version = "10.5.23"; + hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.15"; - hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; - mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.6"; - hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; + version = "10.6.16"; + hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.5"; - hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; + version = "10.11.6"; + hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.3"; - hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; + version = "11.0.4"; + hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/nixpkgs/pkgs/servers/tidb/default.nix b/nixpkgs/pkgs/servers/tidb/default.nix index f5600579a0ef..605ebdf3a711 100644 --- a/nixpkgs/pkgs/servers/tidb/default.nix +++ b/nixpkgs/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpAduymFC17iL9eEssFoHxK+J4EP1QyamchfLetFN/k="; + sha256 = "sha256-OsyQ7YZjErjfWg/1wf21AxBu2wrotey8hJSzoQQ0OSc="; }; - vendorHash = "sha256-GbAZK2TQKc3bziZm202Q2QLLK0TDJ/AplSGKBSLSoqQ="; + vendorHash = "sha256-jtuf3/CClz37TTQ2zs49yryccoaraAG4UrIOIlBYFqQ="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/servers/windmill/Cargo.lock b/nixpkgs/pkgs/servers/windmill/Cargo.lock index 89e22cadf65d..155987a1ab3a 100644 --- a/nixpkgs/pkgs/servers/windmill/Cargo.lock +++ b/nixpkgs/pkgs/servers/windmill/Cargo.lock @@ -34,32 +34,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] [[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -162,6 +174,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] +name = "archiver-rs" +version = "0.5.1" +source = "git+https://github.com/gz/archiver-rs.git?branch=patch-1#a73cef92c2a5b8f48c2a4a9e889952072e03b4b7" +dependencies = [ + "bzip2", + "flate2", + "tar", + "thiserror", + "xz2", + "zip", +] + +[[package]] name = "argon2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -170,7 +195,7 @@ dependencies = [ "base64ct", "blake2", "cpufeatures", - "password-hash", + "password-hash 0.5.0", ] [[package]] @@ -186,25 +211,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] name = "ast_node" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -214,8 +230,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -231,15 +260,15 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd", - "zstd-safe", + "zstd 0.11.2+zstd.1.5.2", + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "flate2", @@ -255,11 +284,11 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -269,12 +298,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -284,15 +313,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling", - "rustix 0.37.26", + "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", @@ -304,7 +333,18 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -313,7 +353,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "http", "rand 0.8.5", @@ -334,7 +374,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -343,15 +383,15 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -365,11 +405,12 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.14.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85eb331f5c2b6ae4ff00aabd20a8a21de88b9890c58579616bf760570b207" +checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" dependencies = [ "chrono", + "futures-util", "hex", "hmac", "http-types", @@ -377,7 +418,8 @@ dependencies = [ "hyper-tls", "serde", "serde_json", - "serde_qs 0.9.2", + "serde_path_to_error", + "serde_qs 0.10.1", "sha2 0.10.8", "smart-default", "smol_str", @@ -400,7 +442,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -419,6 +461,28 @@ dependencies = [ ] [[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 = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +dependencies = [ + "num-traits", +] + +[[package]] name = "atoi" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -440,6 +504,382 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "aws-config" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.0.1", + "hex", + "http", + "hyper", + "ring 0.17.5", + "time", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246" +dependencies = [ + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "fastrand 2.0.1", + "http", + "percent-encoding", + "tracing", + "uuid 1.5.0", +] + +[[package]] +name = "aws-sdk-s3" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf188e8af89adb0b41ae2f21b6c666c618959e40242e79aaa43fafa9c0c90a8a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http", + "http-body", + "once_cell", + "percent-encoding", + "regex", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http", + "num-bigint", + "once_cell", + "p256", + "percent-encoding", + "regex", + "ring 0.17.5", + "sha2 0.10.8", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb5701fbfb40600cc0fa547f318552dfd4e632b2099bd75d95fb0faae70675d" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body", + "md-5 0.10.6", + "pin-project-lite", + "sha1", + "sha2 0.10.8", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b33fa99f928a5815b94ee07e1377901bcf51aa749034a2c802dc38f9dcfacf5" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.9", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "http", + "rustc_version 0.4.0", + "tracing", +] + +[[package]] name = "axum" version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -505,6 +945,12 @@ dependencies = [ ] [[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -518,9 +964,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -547,7 +993,7 @@ dependencies = [ "async-trait", "futures-channel", "futures-util", - "parking_lot", + "parking_lot 0.12.1", "tokio", ] @@ -612,15 +1058,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", "which", ] [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -633,25 +1079,10 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", + "syn 2.0.39", ] [[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" @@ -713,7 +1144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" dependencies = [ "block-padding", - "cipher", + "cipher 0.3.0", ] [[package]] @@ -724,63 +1155,42 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.0", + "async-lock 3.1.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "piper", "tracing", ] [[package]] name = "borsh" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" dependencies = [ "borsh-derive", - "hashbrown 0.13.2", + "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", + "syn_derive", ] [[package]] @@ -796,23 +1206,21 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "btoi" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", + "num-traits", ] [[package]] @@ -858,6 +1266,20 @@ name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "byteorder" @@ -872,6 +1294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + +[[package]] name = "bzip2" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -894,12 +1326,12 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" +checksum = "d60d9b91c73bc662dc45aff607f5ffe79724b7cf7d7c8dc12a72b25921683b67" dependencies = [ "byteorder", - "candle-gemm", + "gemm", "half", "memmap2", "num-traits", @@ -914,135 +1346,10 @@ dependencies = [ ] [[package]] -name = "candle-gemm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" -dependencies = [ - "candle-gemm-c32", - "candle-gemm-c64", - "candle-gemm-common", - "candle-gemm-f16", - "candle-gemm-f32", - "candle-gemm-f64", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-common" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" -dependencies = [ - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f16" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" -dependencies = [ - "candle-gemm-common", - "candle-gemm-f32", - "dyn-stack", - "half", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] name = "candle-nn" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" +checksum = "4eb6e13e7076439309786482d4d4c1b4e1f2b102ca93513372d5419ffcf5df25" dependencies = [ "candle-core", "half", @@ -1055,10 +1362,11 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" +checksum = "0169336de9dc62dd84e19af1408e53ef8ad07eef8fc103cfebf5b6c3e3f23c2c" dependencies = [ + "byteorder", "candle-core", "candle-nn", "num-traits", @@ -1066,6 +1374,7 @@ dependencies = [ "rayon", "serde", "serde_json", + "serde_plain", "tracing", "wav", ] @@ -1108,6 +1417,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1124,9 +1439,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" dependencies = [ "chrono", "chrono-tz-build", @@ -1135,13 +1450,13 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf 0.11.2", - "phf_codegen 0.11.2", + "phf_codegen", ] [[package]] @@ -1154,6 +1469,16 @@ dependencies = [ ] [[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] name = "clang-sys" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1166,9 +1491,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -1176,9 +1501,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -1188,21 +1513,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cmake" @@ -1243,6 +1568,12 @@ dependencies = [ ] [[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" @@ -1293,6 +1624,12 @@ dependencies = [ ] [[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1336,9 +1673,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1363,9 +1700,18 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32c" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +dependencies = [ + "rustc_version 0.4.0", +] [[package]] name = "crc32fast" @@ -1461,6 +1807,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1515,7 +1873,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1537,7 +1895,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1550,7 +1908,7 @@ dependencies = [ "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.9", ] [[package]] @@ -1595,7 +1953,7 @@ checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1607,7 +1965,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1669,7 +2027,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "pin-project", "serde", "serde_json", @@ -1719,7 +2077,7 @@ dependencies = [ "deno-proc-macro-rules", "lazy-regex", "once_cell", - "pmutil", + "pmutil 0.6.1", "proc-macro-crate 1.3.1", "proc-macro2", "quote", @@ -1727,7 +2085,7 @@ dependencies = [ "strum", "strum_macros", "syn 1.0.109", - "syn 2.0.38", + "syn 2.0.39", "thiserror", ] @@ -1739,7 +2097,7 @@ checksum = "010ce5e0a920b2364c75a9e38bcd3344bfe55a6b6cd9ef6717d78e5478f9bcb3" dependencies = [ "deno_core", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1867,17 +2225,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" dependencies = [ "byteorder", - "cipher", + "cipher 0.3.0", "opaque-debug", ] [[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1900,11 +2252,20 @@ dependencies = [ [[package]] name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", ] [[package]] @@ -1919,6 +2280,17 @@ dependencies = [ [[package]] name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" @@ -1970,9 +2342,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dyn-iter" @@ -1982,15 +2354,27 @@ checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" [[package]] name = "dyn-stack" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" dependencies = [ "bytemuck", "reborrow", ] [[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der 0.6.1", + "elliptic-curve", + "rfc6979", + "signature 1.6.4", +] + +[[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2000,12 +2384,35 @@ dependencies = [ ] [[package]] -name = "ena" -version = "0.14.2" +name = "elliptic-curve" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "log", + "base16ct", + "crypto-bigint", + "der 0.6.1", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "embed-doc-image" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" +dependencies = [ + "base64 0.13.1", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -2015,6 +2422,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] name = "encoding_rs" version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2024,6 +2495,26 @@ dependencies = [ ] [[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2031,9 +2522,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2066,6 +2557,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2087,6 +2599,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "filetime" version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2105,12 +2627,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] name = "flate2" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2169,10 +2685,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2200,7 +2716,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2212,7 +2728,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2224,7 +2740,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2245,9 +2761,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2260,9 +2776,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2270,15 +2786,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2287,20 +2803,31 @@ dependencies = [ [[package]] name = "futures-intrusive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.11.2", +] + +[[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", + "parking_lot 0.12.1", ] [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2318,33 +2845,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2365,12 +2902,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.5", "dirs-next", "hyper", "hyper-rustls", "ring 0.16.20", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -2384,6 +2921,123 @@ dependencies = [ ] [[package]] +name = "gemm" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2425,9 +3079,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2444,24 +3098,22 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2508,10 +3160,21 @@ dependencies = [ ] [[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -2519,7 +3182,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -2532,6 +3195,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "bytemuck", "cfg-if", "crunchy", "num-traits", @@ -2545,7 +3209,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -2554,7 +3218,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] @@ -2563,7 +3227,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -2582,7 +3246,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -2627,7 +3291,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" dependencies = [ - "dirs", + "dirs 5.0.1", "indicatif", "log", "native-tls", @@ -2667,9 +3331,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2700,9 +3364,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "base64 0.13.1", - "futures-lite", + "futures-lite 1.13.0", "http", "infer", "pin-project-lite", @@ -2752,17 +3416,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", "hyper", - "rustls", + "log", + "rustls 0.21.9", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -2836,9 +3501,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2864,6 +3529,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2885,32 +3559,34 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-macro" -version = "0.3.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" +checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.5.3", "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is-macro" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" dependencies = [ - "hermit-abi", - "rustix 0.38.20", - "windows-sys 0.48.0", + "Inflector", + "pmutil 0.6.1", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2932,6 +3608,15 @@ dependencies = [ ] [[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" @@ -2948,9 +3633,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2961,7 +3646,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "pem 1.1.1", "ring 0.16.20", "serde", @@ -2970,6 +3655,15 @@ dependencies = [ ] [[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap 2.1.0", +] + +[[package]] name = "konst" version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2994,35 +3688,10 @@ dependencies = [ ] [[package]] -name = "lalrpop" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.6.29", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" -dependencies = [ - "regex", -] +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lazy-regex" @@ -3063,83 +3732,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3170,6 +3766,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libsqlite3-sys" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3221,9 +3828,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -3245,21 +3852,22 @@ dependencies = [ ] [[package]] -name = "lru" -version = "0.10.1" +name = "loki-api" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" dependencies = [ - "hashbrown 0.13.2", + "prost", + "prost-types", ] [[package]] -name = "lz4_flex" -version = "0.9.5" +name = "lru" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ - "twox-hash", + "hashbrown 0.14.2", ] [[package]] @@ -3291,12 +3899,12 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "magic-crypt" -version = "3.1.12" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0196bd5c76f5f51d7d6563545f86262fef4c82d75466ba6f6d359c40a523318d" +checksum = "6c42f95f9d296f2dcb50665f507ed5a68a171453142663ce44d77a4eb217b053" dependencies = [ - "aes", - "base64 0.13.1", + "aes 0.7.5", + "base64 0.21.5", "block-modes", "crc-any", "des", @@ -3324,14 +3932,70 @@ dependencies = [ "base64 0.20.0", "gethostname", "mail-builder", - "rustls", + "rustls 0.21.9", "smtp-proto", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "webpki-roots 0.25.2", ] [[package]] +name = "malachite" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" +dependencies = [ + "malachite-base", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-base" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" +dependencies = [ + "itertools 0.11.0", + "ryu", +] + +[[package]] +name = "malachite-bigint" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c3eca3b5df299486144c8423c45c24bdf9e82e2452c8a1eeda547c4d8b5d41" +dependencies = [ + "derive_more", + "malachite", + "num-integer", + "num-traits", + "paste", +] + +[[package]] +name = "malachite-nz" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" +dependencies = [ + "embed-doc-image", + "itertools 0.11.0", + "malachite-base", +] + +[[package]] +name = "malachite-q" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" +dependencies = [ + "itertools 0.11.0", + "malachite-base", + "malachite-nz", +] + +[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3431,9 +4095,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -3443,9 +4107,9 @@ dependencies = [ [[package]] name = "monostate" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +checksum = "e404e13820ea0df0eda93aa294e0c80de76a0daa6bec590d376fbec6d7810394" dependencies = [ "monostate-impl", "serde", @@ -3453,13 +4117,13 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +checksum = "531c82a934da419bed3da09bd87d6e98c72f8d4aa755427b3b009c2b8b8c433c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3475,16 +4139,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "termcolor", "thiserror", ] [[package]] name = "mysql_async" -version = "0.32.2" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" +checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" dependencies = [ "bytes", "crossbeam", @@ -3492,16 +4156,17 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", + "keyed_priority_queue", "lazy_static", "lru", "mio", "mysql_common", "native-tls", "once_cell", - "pem 2.0.1", + "pem 3.0.2", "percent-encoding", "pin-project", - "priority-queue", + "rand 0.8.5", "serde", "serde_json", "socket2 0.5.5", @@ -3515,15 +4180,16 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.30.6" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" +checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ - "base64 0.21.4", - "bigdecimal 0.3.1", - "bindgen 0.68.1", + "base64 0.21.5", + "bigdecimal 0.4.2", + "bindgen 0.69.1", "bitflags 2.4.1", "bitvec", + "btoi", "byteorder", "bytes", "cc", @@ -3532,7 +4198,6 @@ dependencies = [ "flate2", "frunk", "lazy_static", - "lexical", "mysql-common-derive", "num-bigint", "num-traits", @@ -3549,6 +4214,7 @@ dependencies = [ "thiserror", "time", "uuid 1.5.0", + "zstd 0.12.4", ] [[package]] @@ -3642,8 +4308,8 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ + "bytemuck", "num-traits", - "serde", ] [[package]] @@ -3749,9 +4415,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3770,7 +4436,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3781,9 +4447,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3810,6 +4476,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.8", +] + +[[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3817,12 +4494,37 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -3849,6 +4551,17 @@ dependencies = [ [[package]] name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "password-hash" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" @@ -3871,6 +4584,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.7", + "hmac", + "password-hash 0.4.2", + "sha2 0.10.8", +] + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3887,21 +4612,11 @@ dependencies = [ [[package]] name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.4", - "serde", -] - -[[package]] -name = "pem" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "serde", ] @@ -3930,24 +4645,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "pest" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +name = "pg-embed" +version = "0.7.2" +source = "git+https://github.com/faokunega/pg-embed#72db5e053f0afac6eee51d3baa2fd5c90803e02d" dependencies = [ - "memchr", + "archiver-rs", + "async-trait", + "bytes", + "dirs 5.0.1", + "futures", + "lazy_static", + "log", + "reqwest", + "sqlx 0.6.3", "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.2", + "tokio", + "zip", ] [[package]] @@ -3973,16 +4686,6 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" @@ -4035,7 +4738,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4073,7 +4776,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4150,13 +4853,24 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pmutil" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pmutil" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4177,9 +4891,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postgres" @@ -4214,7 +4928,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "byteorder", "bytes", "fallible-iterator", @@ -4261,6 +4975,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] name = "prettyplease" version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4277,36 +4997,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "priority-queue" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" -dependencies = [ - "autocfg", - "indexmap 1.9.3", + "syn 2.0.39", ] [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "toml 0.5.11", + "once_cell", + "toml_edit 0.19.15", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "once_cell", - "toml_edit", + "toml_edit 0.20.7", ] [[package]] @@ -4397,7 +5107,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "typify", "unicode-ident", @@ -4417,7 +5127,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4436,11 +5146,43 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot", + "parking_lot 0.12.1", "thiserror", ] [[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] name = "psm" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4470,6 +5212,18 @@ dependencies = [ ] [[package]] +name = "pulp" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] name = "quick-xml" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4485,10 +5239,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "equivalent", "hashbrown 0.14.2", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -4571,7 +5325,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -4690,12 +5444,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] @@ -4774,8 +5528,8 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "async-compression 0.4.4", - "base64 0.21.4", + "async-compression 0.4.5", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -4794,7 +5548,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -4802,7 +5556,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-socks", "tokio-util", "tower-service", @@ -4816,6 +5570,17 @@ dependencies = [ ] [[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac", + "zeroize", +] + +[[package]] name = "riff" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4843,7 +5608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4901,21 +5666,19 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", - "signature 2.1.0", + "signature 2.2.0", "spki 0.7.2", "subtle", "zeroize", @@ -4956,7 +5719,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.38", + "syn 2.0.39", "walkdir", ] @@ -4972,9 +5735,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.32.0" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", @@ -5019,22 +5782,22 @@ dependencies = [ [[package]] name = "rustfmt-wrapper" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed729e3bee08ec2befd593c27e90ca9fdd25efdc83c94c3b82eaef16e4f7406e" +checksum = "f1adc9dfed5cc999077978cc7163b9282c5751c8d39827c4ea8c8c220ca5a440" dependencies = [ "serde", "tempfile", "thiserror", - "toml 0.5.11", + "toml 0.8.8", "toolchain_find", ] [[package]] name = "rustix" -version = "0.37.26" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -5046,25 +5809,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +dependencies = [ + "log", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -5083,71 +5858,53 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustpython-ast" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b83af38212db64ecfc76b6d53a1c6de89733236e39c69d4bc8ab565ae167b2" -dependencies = [ - "num-bigint", - "rustpython-compiler-core", -] - -[[package]] -name = "rustpython-compiler-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81870eb757460989d43ce41e069f1a01d0292b33011b23b0455d0a6394e4c77a" +checksum = "fcf9438da3660e6b88bd659fdc0cd13bcff4b85c584026a48b800c75bf0f8d00" dependencies = [ - "bincode", - "bitflags 1.3.2", - "bstr", - "itertools 0.10.5", - "lz4_flex", - "num-bigint", - "num-complex", - "serde", + "is-macro 0.2.2", + "malachite-bigint", + "rustpython-parser-core", "static_assertions", - "thiserror", ] [[package]] name = "rustpython-parser" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7348e148144ba85bc1284d97004062137306554fd00e7eb500d91720de5e78" +checksum = "9db993974ff12f33c5be8a801741463691502f85ead5c503277937c4077bd92a" dependencies = [ - "ahash 0.7.6", "anyhow", + "is-macro 0.2.2", "itertools 0.10.5", - "lalrpop", "lalrpop-util", "log", - "num-bigint", + "malachite-bigint", "num-traits", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf 0.11.2", + "phf_codegen", "rustc-hash", "rustpython-ast", - "rustpython-compiler-core", - "thiserror", + "rustpython-parser-core", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -5155,6 +5912,27 @@ dependencies = [ ] [[package]] +name = "rustpython-parser-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9d560c6dd4dc774d4bbad48c770e074c178c4ed5f6fd0521fcdb639af21bdd" +dependencies = [ + "is-macro 0.2.2", + "memchr", + "rustpython-parser-vendored", +] + +[[package]] +name = "rustpython-parser-vendored" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae3062d7fe5fe38073f3a1c7145ed9a04e15f6e4a596d642c7db2d5cd2b51b" +dependencies = [ + "memchr", + "once_cell", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5182,7 +5960,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bindgen 0.65.1", "chrono", "data-encoding", @@ -5229,9 +6007,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "chrono", "dyn-clone", @@ -5243,9 +6021,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -5267,12 +6045,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5282,6 +6060,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der 0.6.1", + "generic-array", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5310,16 +6102,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -5338,15 +6121,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] name = "seq-macro" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5354,9 +6128,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5394,13 +6168,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5416,11 +6190,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5437,6 +6211,15 @@ dependencies = [ ] [[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] name = "serde_qs" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5449,9 +6232,9 @@ dependencies = [ [[package]] name = "serde_qs" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af4cee6cd4b23b45e6709150d1e9af5c748131de7e3316a7c2b3008051ed725" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" dependencies = [ "percent-encoding", "serde", @@ -5460,9 +6243,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5476,7 +6259,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5509,11 +6292,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5608,9 +6391,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -5651,9 +6434,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smart-default" @@ -5693,6 +6476,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" [[package]] +name = "snap" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" + +[[package]] name = "socket2" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5798,12 +6587,22 @@ dependencies = [ [[package]] name = "sqlx" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +dependencies = [ + "sqlx-core 0.6.3", + "sqlx-macros 0.6.3", +] + +[[package]] +name = "sqlx" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.7.2", + "sqlx-macros 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -5811,12 +6610,65 @@ dependencies = [ [[package]] name = "sqlx-core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +dependencies = [ + "ahash 0.7.7", + "atoi 1.0.0", + "base64 0.13.1", + "bitflags 1.3.2", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dirs 4.0.0", + "dotenvy", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive 0.4.2", + "futures-util", + "hashlink", + "hex", + "hkdf", + "hmac", + "indexmap 1.9.3", + "itoa", + "libc", + "log", + "md-5 0.10.6", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rand 0.8.5", + "rustls 0.20.9", + "rustls-pemfile", + "serde", + "serde_json", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlformat", + "sqlx-rt", + "stringprep", + "thiserror", + "tokio-stream", + "url", + "webpki-roots 0.22.6", + "whoami", +] + +[[package]] +name = "sqlx-core" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ - "ahash 0.8.3", - "atoi", + "ahash 0.8.6", + "atoi 2.0.0", "bigdecimal 0.3.1", "byteorder", "bytes", @@ -5825,21 +6677,21 @@ dependencies = [ "crossbeam-queue", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-io", "futures-util", "hashlink", "hex", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -5857,13 +6709,32 @@ dependencies = [ [[package]] name = "sqlx-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +dependencies = [ + "dotenvy", + "either", + "heck", + "once_cell", + "proc-macro2", + "quote", + "sha2 0.10.8", + "sqlx-core 0.6.3", + "sqlx-rt", + "syn 1.0.109", + "url", +] + +[[package]] +name = "sqlx-macros" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-macros-core", "syn 1.0.109", ] @@ -5884,7 +6755,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -5900,8 +6771,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5926,12 +6797,12 @@ dependencies = [ "once_cell", "percent-encoding", "rand 0.8.5", - "rsa 0.9.2", + "rsa 0.9.3", "serde", "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5945,8 +6816,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5974,7 +6845,7 @@ dependencies = [ "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5983,24 +6854,35 @@ dependencies = [ ] [[package]] +name = "sqlx-rt" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +dependencies = [ + "once_cell", + "tokio", + "tokio-rustls 0.23.4", +] + +[[package]] name = "sqlx-sqlite" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ - "atoi", + "atoi 2.0.0", "chrono", "flume", "futures-channel", "futures-core", "futures-executor", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-util", "libsqlite3-sys", "log", "percent-encoding", "serde", - "sqlx-core", + "sqlx-core 0.7.2", "tracing", "url", "uuid 1.5.0", @@ -6039,7 +6921,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -6063,11 +6945,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6106,7 +6988,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6184,11 +7066,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6198,7 +7080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" dependencies = [ "bitflags 2.4.1", - "is-macro", + "is-macro 0.3.0", "num-bigint", "scoped-tls", "serde", @@ -6233,11 +7115,11 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6316,11 +7198,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6421,10 +7303,10 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6433,10 +7315,10 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6456,11 +7338,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6476,9 +7358,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6486,6 +7368,18 @@ dependencies = [ ] [[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6499,7 +7393,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -6531,34 +7425,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "tempfile" -version = "3.8.0" +name = "tar" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.20", - "windows-sys 0.48.0", + "filetime", + "libc", + "xattr", ] [[package]] -name = "term" -version = "0.7.0" +name = "tempfile" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "dirs-next", - "rustversion", - "winapi", + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6589,7 +7483,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6603,6 +7497,34 @@ dependencies = [ ] [[package]] +name = "tiberius" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6e2bf3e4b5be181a2a2ceff4b9b12e2684010d436a6958bd564fbc8094d44d" +dependencies = [ + "async-trait", + "asynchronous-codec", + "byteorder", + "bytes", + "chrono", + "connection-string", + "encoding", + "enumflags2", + "futures-util", + "num-traits", + "once_cell", + "pin-project-lite", + "pretty-hex", + "rustls-native-certs", + "rustls-pemfile", + "thiserror", + "tokio-rustls 0.23.4", + "tokio-util", + "tracing", + "uuid 1.5.0", +] + +[[package]] name = "tiger" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6669,7 +7591,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tinyvector" version = "0.1.0" -source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" +source = "git+https://github.com/windmill-labs/tinyvector?rev=20823b94c20f2b9093f318badd24026cf54dcc85#20823b94c20f2b9093f318badd24026cf54dcc85" dependencies = [ "anyhow", "bincode", @@ -6691,7 +7613,7 @@ dependencies = [ "clap", "derive_builder", "esaxx-rs", - "getrandom 0.2.10", + "getrandom 0.2.11", "indicatif", "itertools 0.11.0", "lazy_static", @@ -6725,7 +7647,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -6742,7 +7664,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6779,7 +7701,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "parking_lot", + "parking_lot 0.12.1", "percent-encoding", "phf 0.11.2", "pin-project-lite", @@ -6794,11 +7716,22 @@ dependencies = [ [[package]] name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.9", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.9", "tokio", ] @@ -6842,12 +7775,13 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -6856,30 +7790,33 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -6890,7 +7827,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6899,14 +7860,14 @@ dependencies = [ [[package]] name = "toolchain_find" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413" +checksum = "ebc8c9a7f0a2966e1acdaf0461023d0b01471eeead645370cf4c3f5cff153f2a" dependencies = [ "home", - "lazy_static", + "once_cell", "regex", - "semver 0.11.0", + "semver 1.0.20", "walkdir", ] @@ -6937,7 +7898,7 @@ dependencies = [ "cookie", "futures-util", "http", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "tower-layer", "tower-service", @@ -6994,7 +7955,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -7030,13 +7991,45 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-loki" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49bbc87d08020d7c2a9f4bb0b7d10da5381d3867f8ae57fcc54621b34567e963" +dependencies = [ + "loki-api", + "reqwest", + "serde", + "serde_json", + "snap", + "tokio", + "tokio-stream", + "tracing", "tracing-core", + "tracing-log 0.1.4", + "tracing-serde", + "tracing-subscriber", + "url", ] [[package]] @@ -7051,9 +8044,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -7066,7 +8059,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] @@ -7132,7 +8125,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "unicode-ident", ] @@ -7149,17 +8142,11 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.38", + "syn 2.0.39", "typify-impl", ] [[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] name = "ulid" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7304,9 +8291,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "unicode_names2" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" +checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" [[package]] name = "unsafe-libyaml" @@ -7332,12 +8319,12 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "flate2", "log", "native-tls", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-webpki", "serde", "serde_json", @@ -7388,7 +8375,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -7397,7 +8384,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -7482,9 +8469,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7492,24 +8479,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -7519,9 +8506,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7529,28 +8516,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-test" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" dependencies = [ "console_error_panic_hook", "js-sys", @@ -7562,12 +8549,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" dependencies = [ "proc-macro2", "quote", + "syn 2.0.39", ] [[package]] @@ -7594,9 +8582,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -7645,7 +8633,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.20", + "rustix 0.38.24", ] [[package]] @@ -7691,11 +8679,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", - "base64 0.21.4", + "base64 0.21.5", "chrono", "dotenv", "futures", @@ -7703,6 +8691,7 @@ dependencies = [ "git-version", "lazy_static", "once_cell", + "pg-embed", "prometheus", "rand 0.8.5", "reqwest", @@ -7710,7 +8699,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "tokio", "tokio-metrics", "tracing", @@ -7725,7 +8714,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "argon2", @@ -7733,8 +8722,10 @@ dependencies = [ "async-recursion", "async-stripe", "async_zip", + "aws-config", + "aws-sdk-s3", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "candle-core", "candle-nn", @@ -7749,7 +8740,7 @@ dependencies = [ "hf-hub", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "magic-crypt", "mail-send", @@ -7768,7 +8759,7 @@ dependencies = [ "serde_urlencoded", "sha2 0.10.8", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tempfile", "time", "tinyvector", @@ -7792,9 +8783,9 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.188.1" +version = "1.210.1" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "chrono", "openapiv3", "prettyplease 0.1.25", @@ -7810,28 +8801,30 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.188.1" +version = "1.210.1" dependencies = [ "chrono", "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tracing", "windmill-common", ] [[package]] name = "windmill-common" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", "chrono", + "cron", + "git-version", "hex", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "rand 0.8.5", @@ -7840,18 +8833,19 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "thiserror", "tokio", "tracing", "tracing-flame", + "tracing-loki", "tracing-subscriber", "uuid 1.5.0", ] [[package]] name = "windmill-parser" -version = "1.188.1" +version = "1.210.1" dependencies = [ "serde", "serde_json", @@ -7859,7 +8853,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7870,11 +8864,11 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "gosyn", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "regex", "windmill-parser", @@ -7882,7 +8876,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7893,10 +8887,10 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.0", "rustpython-parser", "serde_json", "windmill-parser", @@ -7904,24 +8898,24 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "phf 0.11.2", "regex", "rustpython-parser", "serde_json", - "sqlx", + "sqlx 0.7.2", "windmill-common", "windmill-parser", ] [[package]] name = "windmill-parser-sql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7932,7 +8926,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7949,10 +8943,10 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "getrandom 0.2.10", + "getrandom 0.2.11", "serde_json", "wasm-bindgen", "wasm-bindgen-test", @@ -7967,7 +8961,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", @@ -7979,7 +8973,7 @@ dependencies = [ "futures-core", "hex", "hmac", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "reqwest", @@ -7987,7 +8981,7 @@ dependencies = [ "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tokio", "tracing", "ulid", @@ -7998,11 +8992,11 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "base64 0.21.4", + "base64 0.21.5", "bytes", "chrono", "const_format", @@ -8018,7 +9012,8 @@ dependencies = [ "futures", "gcp_auth", "git-version", - "itertools 0.11.0", + "hex", + "itertools 0.12.0", "jsonwebtoken", "lazy_static", "mysql_async", @@ -8036,9 +9031,11 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", + "tiberius", "tokio", "tokio-postgres", + "tokio-util", "tracing", "urlencoding", "uuid 1.5.0", @@ -8198,9 +9195,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -8234,6 +9231,12 @@ dependencies = [ ] [[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8244,9 +9247,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -8256,17 +9259,37 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zerofrom" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8283,15 +9306,15 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" @@ -8299,9 +9322,18 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes 0.8.3", "byteorder", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -8310,7 +9342,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe 6.0.6", ] [[package]] @@ -8324,6 +9365,16 @@ dependencies = [ ] [[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] name = "zstd-sys" version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/servers/windmill/default.nix b/nixpkgs/pkgs/servers/windmill/default.nix index a10610ea1958..d40ec9f4f0cf 100644 --- a/nixpkgs/pkgs/servers/windmill/default.nix +++ b/nixpkgs/pkgs/servers/windmill/default.nix @@ -14,6 +14,7 @@ , openssl , pango , pixman +, giflib , pkg-config , python3 , rustfmt @@ -23,13 +24,13 @@ let pname = "windmill"; - version = "1.188.1"; + version = "1.210.1"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; + hash = "sha256-ss3EsIqfuctPOEdI5IQtyFFcDzIqnFm6UUG1vA+OlkQ="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -42,7 +43,7 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; + npmDepsHash = "sha256-l9MRaa6TaBg9vFoVuIGZNC9jLS29TlWeSniIBRNDRgU="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory @@ -52,7 +53,7 @@ let npm run generate-backend-client ''; - buildInputs = [ pixman cairo pango ]; + buildInputs = [ pixman cairo pango giflib ]; nativeBuildInputs = [ python3 pkg-config ]; installPhase = '' @@ -93,6 +94,8 @@ rustPlatform.buildRustPackage { outputHashes = { "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; + "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk="; + "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY="; }; }; @@ -118,6 +121,7 @@ rustPlatform.buildRustPackage { openssl rustfmt lld + stdenv.cc.cc.lib ]; nativeBuildInputs = [ @@ -146,6 +150,7 @@ rustPlatform.buildRustPackage { wrapProgram "$out/bin/windmill" \ --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc index 1d953f4bd735..4555ccf0921f 100644 --- a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc @@ -1 +1,7 @@ +if has nix_direnv_watch_file; then + nix_direnv_watch_file default.nix shell.nix +else + watch_file default.nix shell.nix +fi + use nix diff --git a/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/nixpkgs/pkgs/tools/audio/kaldi/default.nix index c9dc204ad405..a13238c0143e 100644 --- a/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "unstable-2023-10-13"; + version = "unstable-2023-11-13"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "1b07b595b0bfd261c87f4efecd022481ed4a196f"; - sha256 = "sha256-S4UD/J28McnJjFu5FH3ElwzXapceUUezfBCgI91eIi0="; + rev = "21ae411fd46282726d893e53c05fef5baea64fef"; + sha256 = "sha256-oPP5znyWI9mYHpwLqHu5aiz5DOIZLcTbgaLiBjFiwrg="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index b738c3097018..38a4bbc35b3b 100644 --- a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-tc3+OHDjsA2OC9YvuOXZMaysKot8O3+qNoymzF2PnwA="; + hash = "sha256-2nCH6L72CldGJk+5SREidlQfqaOvVIpRo/CjDDOHVmA="; }; - vendorHash = "sha256-9pVdoeRyhhxOX3jLZVlx+5eHfP5iu0x40wnpV0xq3Z0="; + vendorHash = "sha256-ViUnMiu6iMb/Ugbyx5FEGe5XSKf/wiOt/xAq/rT/Fzs="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/nixpkgs/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix index 75e5340c2613..647991b412a2 100644 --- a/nixpkgs/pkgs/tools/misc/multitail/default.nix +++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.1.1"; + version = "7.1.2"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-qQc7FqpkAri/RE1hJIC4P6n1Jc6TJwBcR0Dp5n5QDQg="; + sha256 = "sha256-00NZI/KFcgEAkvESnx0KQFW1GvX6FgZLA4Z1Fv2qi+E="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix index 826d77815bc3..dc8e545a7d8e 100644 --- a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ python3 ]; + checkFlags = [ + # tests are failing upstream + "--skip=test_dot" + "--skip=test_dotdot" + ]; + preCheck = '' patchShebangs tests/editors/env-editor.py ''; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index b503cc5785c0..8a40b290ae48 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -21,12 +21,12 @@ let owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.48.1"; + version = "7.49.0"; src = fetchFromGitHub { inherit owner repo; rev = version; - hash = "sha256-3PFplTR/L2xJjQ5GEz2ow28SEHWafOmiLjIQHQqAaso="; + hash = "sha256-0/9Yngfnbq73ZWsHHF3yDNGBB+u4X9SKbv+lJdv0J/w="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -43,7 +43,7 @@ in buildGoModule rec { doCheck = false; - vendorHash = "sha256-o7CTw7IIS5xueW20O1wKDV1Yji7PhGhp+6+i2ymKhxE="; + vendorHash = "sha256-oBqH5sbT1+dLnAfouh4Vyds3M5pw5Z7u8XGGBTXflS0="; subPackages = [ "cmd/agent" diff --git a/nixpkgs/pkgs/tools/networking/ngrok/versions.json b/nixpkgs/pkgs/tools/networking/ngrok/versions.json index 75a00531f2b7..ef2b4e3d235d 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok/versions.json +++ b/nixpkgs/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/3iiMKzJiBb/ngrok-v3-3.3.4-linux-386", - "sha256": "e46b1bfa8afe28b2c5a7630773ab2d8fc1c91ac42e262356c1cec1197e754419", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", + "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", + "version": "3.4.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/99d4KobYYHN/ngrok-v3-3.3.4-linux-amd64", - "sha256": "11536e5a001de5efa9a6d9d6f33b0ed2dc653216278fe0314f9ca98c20137a7f", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", + "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", + "version": "3.4.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/2VZGKNPHQqs/ngrok-v3-3.3.4-linux-arm", - "sha256": "08d7b27407005c9a34a850090527c1398e86a1a2fa090aea2caee40cb18902fe", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", + "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", + "version": "3.4.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/2XmLxPHmx2B/ngrok-v3-3.3.4-linux-arm64", - "sha256": "1e12cedb3378d25012c3cd94f960123b4d8b99301d52ad9c30df9e698ed1fa2d", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", + "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", + "version": "3.4.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/mos87CnnNu3/ngrok-v3-3.3.4-darwin-amd64", - "sha256": "700311045d531f603a5f472c7e4b8271810ac75e368c65430a62f5e178abe9dc", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", + "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", + "version": "3.4.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/ngMbyRxxdNN/ngrok-v3-3.3.4-darwin-arm64", - "sha256": "e609d3d78d004ec4f795581cba35f38ba43e7b0b5ae1cd80aa21650402e531d0", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", + "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", + "version": "3.4.0" } } diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix index 790d1d9cecdf..60240094b436 100644 --- a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rosenpass"; - version = "unstable-2023-09-28"; + version = "0.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "b15f17133f8b5c3c5175b4cfd4fc10039a4e203f"; - hash = "sha256-UXAkmt4VY0irLK2k4t6SW+SEodFE3CbX5cFbsPG0ZCo="; + rev = "v${version}"; + hash = "sha256-t5AeJqeV16KCUoBm1GUzj/U6q382CRCR/XG6B2MiBU4="; }; - cargoHash = "sha256-N1DQHkgKgkDQ6DbgQJlpZkZ7AMTqX3P8R/cWr14jK2I="; + cargoHash = "sha256-caYJP3SNpZxtV9y3D62CuzJ5RjMoq98D9W0Fms5E3Nc="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate diff --git a/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix b/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix index 2a74445ec270..f258a207db16 100644 --- a/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.7"; + version = "1.6.9"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7wUgmIScrj47QigIKHLMcvaJ/LTRHcMnJGKPBUTzVYo="; + hash = "sha256-VaaUFUkPXAMzT+wyLOrOw85sgJzWCYx5k6oTfRcIHuU="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 9d87db3408ef..63ca778c6db4 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-L+qHcC5SQPHiflTc4vYmVyME1KyfG9wug3fO7ib7Ffk="; + sha256 = "sha256-e3AGegW0V7JK6iLy0PaMwSeA9+2wSouzX5QIYUg8HCk="; }; - cargoSha256 = "sha256-W6fqZJcyKm5+4DFm+lFxIACw3nvQ6TK3sZJdIrkxjjw="; + cargoSha256 = "sha256-JE8SKxc7fKlK637NCZnTKkbF4GNrrvJQ/2kGxK4WXpg="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/nixpkgs/pkgs/tools/networking/zap/default.nix b/nixpkgs/pkgs/tools/networking/zap/default.nix index 9109b60eaa27..f763c609aae8 100644 --- a/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-k261Kg/TkMHviQxFVCDZXOIAYv4TbsCSfgI+K69Q9Uk="; + sha256 = "sha256-IZ1/JbviUkdxOAWrAswSJ5iYyHB0PBquPCsLGIIZGWA="; }; buildInputs = [ jre ]; diff --git a/nixpkgs/pkgs/tools/networking/zrok/default.nix b/nixpkgs/pkgs/tools/networking/zrok/default.nix index 7420942a1c76..7b49b4a26b97 100644 --- a/nixpkgs/pkgs/tools/networking/zrok/default.nix +++ b/nixpkgs/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-c/MLhCmfoC5qbIH8psHqVexjKGb6P9vxMag7igFKt84="; - aarch64-linux = "sha256-CaZr0Izhwkdb6Hf3wRdOskoDg3m9LNgCPgfxka+ZwWo="; - armv7l-linux = "sha256-YVqm2tfcti5a6adN9Rn8X41nTTT5bajSJ0qIEvgk/8s="; + x86_64-linux = "sha256-6oYZY1Ry4U/nR99DNsr7ZqTd/AAot+yrOHY75UXEuWY="; + aarch64-linux = "sha256-/XAv/ptvUsWLF/iIOiqm/PoCLhVTL3Cnmd0YdqLBthk="; + armv7l-linux = "sha256-CbtzY2q7HnqCcolTFyTphWbHN/VdSt/rs8q3tjHHNqc="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.10"; + version = "0.4.15"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index f7f6f4e04dbf..183e7f019e62 100644 --- a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-QgKzpFdzisWD6DZxs1LsKINBr/bSYQILpEu5RdcNgbc="; + sha256 = "sha256-g1PBPpvK3kg0bJEDXsifVgcl3+v54q08Ae3nZ4cJ+Xs="; }; - cargoHash = "sha256-MztvOV1yAOgpwPYOUUZb7XHKhhhd/fvKPIFbsnMdhAQ="; + cargoHash = "sha256-E5SJfwGfy1DcLC0cF/5FTbVEJs/WYb2KO+OdOo2fgQk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec { description = "Generate documentation for Nix functions"; homepage = "https://github.com/nix-community/nixdoc"; license = [ licenses.gpl3 ]; - maintainers = [ maintainers.asymmetric ]; + maintainers = with maintainers; [ + infinisil + asymmetric + ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/security/boofuzz/default.nix b/nixpkgs/pkgs/tools/security/boofuzz/default.nix index 37724d87394d..39b35d6944de 100644 --- a/nixpkgs/pkgs/tools/security/boofuzz/default.nix +++ b/nixpkgs/pkgs/tools/security/boofuzz/default.nix @@ -6,16 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "boofuzz"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.2"; + pyproject = true; src = fetchFromGitHub { owner = "jtpereyda"; - repo = pname; + repo = "boofuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-mbxImm5RfYWq1JCCSvvG58Sxv2ad4BOh+RLvtNjQCKE="; + hash = "sha256-ffZVFmfDAJ+Qn3hbeHY/CvYgpDLxB+jaYOiYyZqZ7mo="; }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ attrs click @@ -42,8 +46,6 @@ python3.pkgs.buildPythonApplication rec { "TestNoResponseFailure" "TestProcessMonitor" "TestSocketConnection" - # SyntaxError: invalid syntax, https://github.com/jtpereyda/boofuzz/issues/663 - "test_msg_60_bytes" ] ++ lib.optionals stdenv.isDarwin [ "test_time_repeater" ]; diff --git a/nixpkgs/pkgs/tools/security/cherrybomb/default.nix b/nixpkgs/pkgs/tools/security/cherrybomb/default.nix index 9f1478a8d231..4bb975d3394c 100644 --- a/nixpkgs/pkgs/tools/security/cherrybomb/default.nix +++ b/nixpkgs/pkgs/tools/security/cherrybomb/default.nix @@ -1,30 +1,22 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "cherrybomb"; - version = "1.0.0"; + version = "1.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-qZ1eKcRAwCzrzvw6QR28oZ8sGnsXmoOW/bWLQTlpqlo="; + hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; - cargoHash = "sha256-eosK7MQ3UB8rxKHCrb3s3+BVarv19h0cL+uzwg95Hc8="; + cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/security/ffuf/default.nix b/nixpkgs/pkgs/tools/security/ffuf/default.nix index 3831ff4d8e22..e0e5976c7510 100644 --- a/nixpkgs/pkgs/tools/security/ffuf/default.nix +++ b/nixpkgs/pkgs/tools/security/ffuf/default.nix @@ -1,23 +1,38 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch }: buildGoModule rec { pname = "ffuf"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "ffuf"; + repo = "ffuf"; rev = "refs/tags/v${version}"; - hash = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk="; + hash = "sha256-+wcNqQHtB8yCLiJXMBxolCWsYZbBAsBGS1hs7j1lzUU="; }; - vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4="; + vendorHash = "sha256-SrC6Q7RKf+gwjJbxSZkWARw+kRtkwVv1UJshc/TkNdc="; + + patches = [ + # Fix CSV test, https://github.com/ffuf/ffuf/pull/731 + (fetchpatch { + name = "fix-csv-test.patch"; + url = "https://github.com/ffuf/ffuf/commit/7f2aae005ad73988a1fa13c1c33dab71f4ae5bbd.patch"; + hash = "sha256-/v9shGICmsbFfEJe4qBkBHB9PVbBlrjY3uFmODxHu9M="; + }) + ]; + + ldflags = [ + "-w" + "-s" + ]; meta = with lib; { - description = "Fast web fuzzer written in Go"; + description = "Tool for web fuzzing"; longDescription = '' FFUF, or “Fuzz Faster you Fool” is an open source web fuzzing tool, intended for discovering elements and content within web applications diff --git a/nixpkgs/pkgs/tools/security/ghidra/default.nix b/nixpkgs/pkgs/tools/security/ghidra/default.nix index 34dcca4b4ca3..5f9346937b36 100644 --- a/nixpkgs/pkgs/tools/security/ghidra/default.nix +++ b/nixpkgs/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.3.1"; - versiondate = "20230614"; + version = "10.4"; + versiondate = "20230928"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-I4FUEbBF/iwMP/iiA9Hjf36J4sAInhO80hLTbxWmUFc="; + hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/ldeep/default.nix b/nixpkgs/pkgs/tools/security/ldeep/default.nix index 6d05f3972499..d0bd3bb415ba 100644 --- a/nixpkgs/pkgs/tools/security/ldeep/default.nix +++ b/nixpkgs/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.44"; + version = "1.0.48"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-qjo5vpT+CtNiNBS0enLzQcsyq/dqRrOTHVB1qqOReM8="; + hash = "sha256-E/gqt8+eD/syOHczq9k07YIq39W84vC5VFScMxxj4uI="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 424f5811a486..0cb3f7733243 100644 --- a/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.62.1"; + version = "3.63.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-dDz8czTYRxmhyFaYuSoqnBwT7lMZDENBuH+F0HpaouE="; + hash = "sha256-7heKPssACk6CI0O29U2astkwJAYk3a043l8Cqz6swMg="; }; vendorHash = "sha256-+Boe/bzCsmihspGqmiJ3jOcRJ9KPjkzu6MBmgtAgwjE="; diff --git a/nixpkgs/pkgs/tools/text/gtree/default.nix b/nixpkgs/pkgs/tools/text/gtree/default.nix index 4925ce397190..e151a1467446 100644 --- a/nixpkgs/pkgs/tools/text/gtree/default.nix +++ b/nixpkgs/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-sfw+Si6g6NVUWZdB6q3wnoabMAqIR9/KT1HsXtbafDY="; + hash = "sha256-KFEYkhCLMcJ4NkHu0kkuG70EvJQ3HYDvicmomcMJZjc="; }; - vendorHash = "sha256-3g47EuDElz1lrw7pgzD1jtTAs2Up97WWWFHe6aFE9zk="; + vendorHash = "sha256-rvVrVv73gW26UUy1MyxKDjUgX1mrMMii+l8qU2hLOek="; subPackages = [ "cmd/gtree" diff --git a/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock b/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock index 9c93b91631e1..2064e8c6a1ff 100644 --- a/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock +++ b/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock @@ -3,65 +3,39 @@ version = 3 [[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[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 = "anstyle" -version = "0.3.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" dependencies = [ "derive_arbitrary", ] [[package]] name = "assert_cmd" -version = "2.0.10" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.1", + "predicates 3.0.4", "predicates-core", "predicates-tree", "wait-timeout", @@ -69,31 +43,20 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d5bf7e5441c6393b5a9670a5036abe6b4847612f594b870f7332dbf10cf6fa" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ "anstyle", "doc-comment", "globwalk", - "predicates 3.0.1", + "predicates 3.0.4", "predicates-core", "predicates-tree", "tempfile", ] [[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" @@ -103,22 +66,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" name = "benchmark" version = "0.1.3" dependencies = [ - "criterion", + "divan", "melody_compiler", "pomsky", ] [[package]] name = "bindgen" -version = "0.59.2" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", - "clap 2.34.0", - "env_logger", "lazy_static", "lazycell", "log", @@ -128,6 +89,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -138,6 +100,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -148,35 +116,23 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] [[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -195,37 +151,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -234,124 +163,43 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", + "clap_builder", ] [[package]] -name = "clap" -version = "3.2.23" +name = "clap_builder" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ - "bitflags", + "anstyle", "clap_lex", - "indexmap", - "textwrap 0.16.0", + "terminal_size 0.3.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 = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "git+https://github.com/bheisler/criterion.rs?branch=version-0.4#935c6327e152e44f2b9178797682b9b99b5123a5" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.23", - "criterion-plot", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "git+https://github.com/bheisler/criterion.rs?branch=version-0.4#935c6327e152e44f2b9178797682b9b99b5123a5" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[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.14" +name = "condtype" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] +checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] -name = "crossbeam-utils" -version = "0.8.15" +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "cfg-if", + "libc", ] [[package]] @@ -366,13 +214,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -383,68 +231,65 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "divan" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "fab20f5802e0b897093184f5dc5d23447fa715604f238dc798f6da188b230019" +dependencies = [ + "clap", + "condtype", + "divan-macros", + "linkme", + "regex-lite", +] [[package]] -name = "either" -version = "1.8.1" +name = "divan-macros" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "1c5d6354551e0b5c451a948814fc47fe745a14eac7835c087d60162661019db4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] -name = "env_logger" -version = "0.9.3" +name = "doc-comment" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "errno" -version = "0.2.8" +name = "either" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "float-cmp" @@ -463,26 +308,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", ] [[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -490,9 +324,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -507,61 +341,31 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] [[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", -] - -[[package]] name = "helptext" version = "0.1.0" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "libc", + "windows-sys", ] [[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] name = "ignore" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -579,45 +383,14 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", -] - -[[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -636,27 +409,27 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] -name = "jobserver" -version = "0.1.26" +name = "itoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] -name = "js-sys" -version = "0.3.61" +name = "jobserver" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ - "wasm-bindgen", + "libc", ] [[package]] @@ -679,9 +452,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -694,25 +467,42 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "linkme" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" +dependencies = [ + "linkme-impl", +] [[package]] -name = "log" -version = "0.4.17" +name = "linkme-impl" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ - "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] name = "melody_compiler" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c65dfed91963cb9aa714e283edbc99cfffc3a971f9ea816eed3dbf593d378d6" +checksum = "7684213d4adcea6264d0fd61379a0eb9968d0866de0f05c75dee3af02a6c6ff8" dependencies = [ "once_cell", "pest", @@ -722,24 +512,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "miette" -version = "5.6.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "is-terminal", "miette-derive", @@ -748,21 +529,21 @@ dependencies = [ "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size", - "textwrap 0.15.2", + "terminal_size 0.1.17", + "textwrap", "thiserror", "unicode-width", ] [[package]] name = "miette-derive" -version = "5.6.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -789,28 +570,18 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "onig" @@ -818,7 +589,7 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "once_cell", "onig_sys", @@ -827,8 +598,7 @@ dependencies = [ [[package]] name = "onig_sys" version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +source = "git+https://github.com/rust-onig/rust-onig#fa90c0e97e90a056af89f183b23cd417b59ee6a2" dependencies = [ "bindgen", "cc", @@ -836,18 +606,6 @@ dependencies = [ ] [[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -855,21 +613,20 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pcre2" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1" +checksum = "9deb1d02d6a373ee392128ba86087352a986359f32a106e2e3b08cc90cc659c9" dependencies = [ "libc", "log", "pcre2-sys", - "thread_local", ] [[package]] name = "pcre2-sys" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec30e5e9ec37eb8fbf1dea5989bc957fd3df56fbee5061aa7b7a99dbb37b722" +checksum = "ae234f441970dbd52d4e29bee70f3b56ca83040081cb2b55b7df772b16e0b06e" dependencies = [ "cc", "libc", @@ -884,19 +641,20 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pest" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" dependencies = [ "pest", "pest_generator", @@ -904,22 +662,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" dependencies = [ "once_cell", "pest", @@ -928,47 +686,17 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pomsky" -version = "0.10.0" +version = "0.11.0" dependencies = [ "arbitrary", - "atty", "lexopt", "miette", - "once_cell", "pomsky-syntax", "regex", "regex-test", @@ -976,14 +704,14 @@ dependencies = [ [[package]] name = "pomsky-bin" -version = "0.10.0" +version = "0.11.0" dependencies = [ "assert_cmd", "assert_fs", - "atty", "helptext", "lexopt", "miette", + "pcre2", "pomsky", "predicates 2.1.5", "serde", @@ -993,17 +721,17 @@ dependencies = [ [[package]] name = "pomsky-macro" -version = "0.10.0" +version = "0.11.0" dependencies = [ "pomsky", ] [[package]] name = "pomsky-syntax" -version = "0.10.0" +version = "0.11.0" dependencies = [ "arbitrary", - "strsim 0.10.0", + "strsim", ] [[package]] @@ -1014,7 +742,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1022,13 +750,13 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.11.0", "predicates-core", ] @@ -1050,58 +778,48 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[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" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "bitflags 1.3.2", ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "regex" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "bitflags", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.2" +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1109,16 +827,16 @@ dependencies = [ ] [[package]] -name = "regex-automata" -version = "0.1.10" +name = "regex-lite" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regex-test" @@ -1137,23 +855,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.11" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1165,36 +882,30 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] name = "serde" -version = "1.0.158" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1203,9 +914,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1214,21 +925,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "strsim" @@ -1238,9 +943,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -1248,9 +953,9 @@ dependencies = [ [[package]] name = "supports-hyperlinks" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ "is-terminal", ] @@ -1277,9 +982,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.4" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1288,34 +993,35 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "terminal_size" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ - "winapi-util", + "libc", + "winapi", ] [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1326,15 +1032,6 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[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.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" @@ -1345,29 +1042,23 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.38", ] [[package]] @@ -1381,54 +1072,34 @@ dependencies = [ ] [[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 = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "version_check" @@ -1447,93 +1118,24 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", ] [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -1554,9 +1156,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1569,33 +1171,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1608,42 +1195,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/nixpkgs/pkgs/tools/text/pomsky/default.nix b/nixpkgs/pkgs/tools/text/pomsky/default.nix index 45e44b06e8a5..474ea404c937 100644 --- a/nixpkgs/pkgs/tools/text/pomsky/default.nix +++ b/nixpkgs/pkgs/tools/text/pomsky/default.nix @@ -1,23 +1,36 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, oniguruma }: rustPlatform.buildRustPackage rec { pname = "pomsky"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "pomsky-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-V4WztquClcBQF74c8WalWITT+SRymEawLXmvTflNEGk="; + hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "criterion-0.3.6" = "sha256-biFm0+AjKLwV9yHgCaK6E6L6W+6sRbnY2QOKVhv/1C8="; + "onig_sys-69.8.1" = "sha256-NJv/Dooh93yQ9KYyuNBhO1c4U7Gd7X007ECXyRsztrY="; }; }; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + oniguruma + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads'' doCheck = false; diff --git a/nixpkgs/pkgs/tools/text/ugrep/default.nix b/nixpkgs/pkgs/tools/text/ugrep/default.nix index c347ac967cc8..a8acf6f1aa42 100644 --- a/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -2,7 +2,9 @@ , stdenv , fetchFromGitHub , boost +, brotli , bzip2 +, bzip3 , lz4 , pcre2 , xz @@ -12,18 +14,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-0yg68lBEHiyRD3FE5oe67hMhhEHOFf7/PMA+88J9LuI="; + hash = "sha256-GYqIunSApnBfct+olre0eGy8KuOtbaiPvW0tQIcBRLQ="; }; buildInputs = [ boost + brotli bzip2 + bzip3 lz4 pcre2 xz @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultra fast grep with interactive query UI"; homepage = "https://github.com/Genivia/ugrep"; changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}"; - maintainers = with maintainers; [ numkem ]; + maintainers = with maintainers; [ numkem mikaelfangel ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/typesetting/typst-preview/default.nix b/nixpkgs/pkgs/tools/typesetting/typst-preview/default.nix deleted file mode 100644 index ac3786f5513b..000000000000 --- a/nixpkgs/pkgs/tools/typesetting/typst-preview/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, fetchYarnDeps, mkYarnPackage, darwin -, stdenv }: - -let - name = "typst-preview"; - version = "0.9.0"; - src = fetchFromGitHub { - owner = "Enter-tainer"; - repo = name; - rev = "v${version}"; - hash = "sha256-r/zDvfMvfvZqa3Xkzk70tIEyhc5LDwqc2A5MUuK2xC0="; - }; - frontendSrc = "${src}/addons/frontend"; - frontend = mkYarnPackage rec { - inherit version; - pname = "${name}-frontend"; - src = frontendSrc; - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${frontendSrc}/yarn.lock"; - hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA="; - }; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -R deps/${pname}/dist $out - runHook postInstall - ''; - doDist = false; - }; - -in rustPlatform.buildRustPackage rec { - - pname = name; - inherit version src; - - buildInputs = lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ - Security - SystemConfiguration - CoreServices - ]); - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4="; - "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk="; - "typst-ts-compiler-0.4.0-rc9" = - "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM="; - }; - }; - - prePatch = '' - mkdir -p addons/vscode/out/frontend - cp -R ${frontend}/* addons/vscode/out/frontend/ - ''; - - meta = with lib; { - description = "Preview your Typst files in vscode"; - homepage = "https://github.com/Enter-tainer/typse-preview"; - license = licenses.mit; - maintainers = with maintainers; [ berberman ]; - mainProgram = "typst-preview"; - }; -} diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 716ead49c30f..df1ee47a4f2f 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ MACS2 = macs2; # Added 2023-06-12 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 + mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 191c3b1147f5..ab10d8f3aa22 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -9304,7 +9304,10 @@ with pkgs; stdenv = gcc8Stdenv; }; - hylafaxplus = callPackage ../servers/hylafaxplus { }; + hylafaxplus = callPackage ../servers/hylafaxplus { + # libtiff >= 4.6 dropped many executables needed by hylafaxplus + libtiff = libtiff_4_5; + }; hyphen = callPackage ../development/libraries/hyphen { }; @@ -12493,6 +12496,8 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + qlog = qt6Packages.callPackage ../applications/radio/qlog { }; + qnial = callPackage ../development/interpreters/qnial { }; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; @@ -14237,8 +14242,6 @@ with pkgs; typst-live = callPackage ../tools/typesetting/typst-live { }; - typst-preview = callPackage ../tools/typesetting/typst-preview { }; - tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; @@ -17275,7 +17278,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; }; - squeak = callPackage ../development/compilers/squeak { }; + squeak = callPackage ../development/compilers/squeak { + stdenv = clangStdenv; + }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { drivers = [ jtds_jdbc mssql_jdbc mysql_jdbc postgresql_jdbc ]; @@ -23503,6 +23508,7 @@ with pkgs; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; libtiff = callPackage ../development/libraries/libtiff { }; + libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -26914,7 +26920,6 @@ with pkgs; inherit (import ../servers/sql/mariadb pkgs) mariadb_105 mariadb_106 - mariadb_1010 mariadb_1011 mariadb_110 ; @@ -34095,9 +34100,9 @@ with pkgs; okteto = callPackage ../development/tools/okteto { }; onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { }; - onlyoffice-bin_7_4 = callPackage ../applications/office/onlyoffice-bin/7_4.nix { }; + onlyoffice-bin_7_5 = callPackage ../applications/office/onlyoffice-bin/7_5.nix { }; onlyoffice-bin = onlyoffice-bin_7_2; - onlyoffice-bin_latest = onlyoffice-bin_7_4; + onlyoffice-bin_latest = onlyoffice-bin_7_5; onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; @@ -34553,9 +34558,7 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; + orpie = callPackage ../applications/misc/orpie { }; osmo = callPackage ../applications/office/osmo { }; diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 0b970cb44f04..b8f11100d39c 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -1,37 +1,12 @@ { buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }: let - # These are attributes in compiler and packages that don't support integer-simple. - integerSimpleExcludes = [ - "ghc865Binary" - "ghc8102Binary" - "ghc8107Binary" - "ghc924Binary" - "ghcjs" - "ghcjs810" - "integer-simple" - "native-bignum" - "ghc902" - "ghc90" - "ghc924" - "ghc925" - "ghc926" - "ghc927" - "ghc928" - "ghc92" - "ghc942" - "ghc943" - "ghc944" - "ghc945" - "ghc946" - "ghc947" - "ghc94" - "ghc96" - "ghc962" - "ghc963" - "ghc981" - "ghc98" - "ghcHEAD" + # These are attributes in compiler that support integer-simple. + integerSimpleIncludes = [ + "ghc88" + "ghc884" + "ghc810" + "ghc8107" ]; nativeBignumIncludes = [ @@ -50,6 +25,7 @@ let "ghc945" "ghc946" "ghc947" + "ghc948" "ghc96" "ghc962" "ghc963" @@ -363,7 +339,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc947; + ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + 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 >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc94 = compiler.ghc948; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -437,7 +437,7 @@ in { # build with integer-simple instead of integer-gmp. integer-simple = let integerSimpleGhcNames = pkgs.lib.filter - (name: ! builtins.elem name integerSimpleExcludes) + (name: builtins.elem name integerSimpleIncludes) (pkgs.lib.attrNames compiler); in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames @@ -558,7 +558,12 @@ in { ghc = bh.compiler.ghc947; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc947; + ghc948 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc948; + ghc = bh.compiler.ghc948; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc948; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; @@ -595,7 +600,7 @@ in { integer-simple = let integerSimpleGhcNames = pkgs.lib.filter - (name: ! builtins.elem name integerSimpleExcludes) + (name: builtins.elem name integerSimpleIncludes) (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index 6f105d0fcccf..c6514dbdc63c 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 + adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute."; # Added 2023-11-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 4b29edee0ec6..a612e6b98524 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -54,8 +54,6 @@ self: super: with self; { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; - adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; - adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 4da9f03952af..39ea843bcea2 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -487,7 +487,7 @@ let cabal-install = lib.subtractLists [ compilerNames.ghc981 ] released; - Cabal_3_10_2_0 = lib.subtractLists [ + Cabal_3_10_2_1 = lib.subtractLists [ compilerNames.ghc981 ] released; Cabal-syntax_3_10_1_0 = lib.subtractLists [ |