diff options
81 files changed, 1469 insertions, 1611 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 10224db34288c..601109ccee5e4 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -429,6 +429,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store. +- `gitea` module options have been changed to be RFC042 conforming (i.e. some options were moved to be located under `services.gitea.settings`) + - `boot.initrd.luks.device.<name>` has a new `tryEmptyPassphrase` option, this is useful for OEM's who need to install an encrypted disk with a future settable passphrase - Lisp gained a [manual section](https://nixos.org/manual/nixpkgs/stable/#lisp), documenting a new and backwards incompatible interface. The previous interface will be removed in a future release. diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index 520db128acd9f..2a35afad2ac76 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -10,10 +10,7 @@ let check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x); }; - impanel = - if cfg.panel != null - then "--panel=${cfg.panel}" - else ""; + impanel = optionalString (cfg.panel != null) "--panel=${cfg.panel}"; ibusAutostart = pkgs.writeTextFile { name = "autostart-ibus-daemon"; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 8fa070b03db31..ea17e2a705ede 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -22,8 +22,8 @@ let (option: '' menuentry '${defaults.name} ${ # Name appended to menuentry defaults to params if no specific name given. - option.name or (if option ? params then "(${option.params})" else "") - }' ${if option ? class then " --class ${option.class}" else ""} { + option.name or (optionalString (option ? params) "(${option.params})") + }' ${optionalString (option ? class) " --class ${option.class}"} { linux ${defaults.image} \''${isoboot} ${defaults.params} ${ option.params or "" } diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index a1134e774364a..81c68307aee14 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -11,7 +11,7 @@ let ${concatStringsSep "\n" (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) } - ${if cfg.clearDefaultCommands then "#stop" else ""} + ${optionalString cfg.clearDefaultCommands "#stop"} #line-edit ${concatStringsSep "\n" diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 58c9cbc3ed003..4f452f1d7f9b5 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkIf types; + inherit (lib) mkOption mkIf types optionalString; cfg = config.programs.tmux; @@ -17,17 +17,17 @@ let set -g base-index ${toString cfg.baseIndex} setw -g pane-base-index ${toString cfg.baseIndex} - ${if cfg.newSession then "new-session" else ""} + ${optionalString cfg.newSession "new-session"} - ${if cfg.reverseSplit then '' + ${optionalString cfg.reverseSplit '' bind v split-window -h bind s split-window -v - '' else ""} + ''} set -g status-keys ${cfg.keyMode} set -g mode-keys ${cfg.keyMode} - ${if cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize then '' + ${optionalString (cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize) '' bind h select-pane -L bind j select-pane -D bind k select-pane -U @@ -37,15 +37,15 @@ let bind -r J resize-pane -D ${toString cfg.resizeAmount} bind -r K resize-pane -U ${toString cfg.resizeAmount} bind -r L resize-pane -R ${toString cfg.resizeAmount} - '' else ""} + ''} - ${if (cfg.shortcut != defaultShortcut) then '' + ${optionalString (cfg.shortcut != defaultShortcut) '' # rebind main key: C-${cfg.shortcut} unbind C-${defaultShortcut} set -g prefix C-${cfg.shortcut} bind ${cfg.shortcut} send-prefix bind C-${cfg.shortcut} last-window - '' else ""} + ''} setw -g aggressive-resize ${boolToStr cfg.aggressiveResize} setw -g clock-mode-style ${if cfg.clock24 then "24" else "12"} diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index ef0636258994c..66d1d2c5d9c5b 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -781,11 +781,11 @@ in { # FIXME Most of these custom warnings and filters for security.acme.certs.* are required # because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible. - warnings = filter (w: w != "") (mapAttrsToList (cert: data: if data.extraDomains != "_mkMergedOptionModule" then '' + warnings = filter (w: w != "") (mapAttrsToList (cert: data: optionalString (data.extraDomains != "_mkMergedOptionModule") '' The option definition `security.acme.certs.${cert}.extraDomains` has changed to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings. Setting a custom webroot for extra domains is not possible, instead use separate certs. - '' else "") cfg.certs); + '') cfg.certs); assertions = let certs = attrValues cfg.certs; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 2af42eeb3705b..dbab741bf6fc7 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -275,9 +275,9 @@ in { warnings = # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 - filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then '' + filter (w: w != "") (mapAttrsToList (k: v: optionalString (v.type == "spotify") '' services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. - '' else "") cfg.streams); + '') cfg.streams); systemd.services.snapserver = { after = [ "network.target" ]; diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 289291c6bd2f9..9fbc599cd41af 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -20,7 +20,7 @@ let ''; backupDatabaseScript = db: '' dest="${cfg.location}/${db}.gz" - if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then + if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index ca796cf7797e6..d19b98a3e4bbb 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -300,7 +300,7 @@ in filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) - then if (backup.paths != null) then concatStringsSep " " backup.paths else "" + then optionalString (backup.paths != null) (concatStringsSep " " backup.paths) else "--files-from ${filesFromTmpFile}"; pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index eca308dc366d1..d12516ca2f249 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -196,9 +196,9 @@ in --gcmode ${cfg.gcmode} \ --port ${toString cfg.port} \ --maxpeers ${toString cfg.maxpeers} \ - ${if cfg.http.enable then ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}'' else ""} \ + ${optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \ ${optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \ - ${if cfg.websocket.enable then ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}'' else ""} \ + ${optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \ ${optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \ ${optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \ --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \ diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 3a1c6c1a371df..d6a8c2a3f7cce 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -242,7 +242,7 @@ in { jobdir="${jenkinsCfg.home}/$jenkinsjobname" rm -rf "$jobdir" done - '' + (if cfg.accessUser != "" then reloadScript else ""); + '' + (optionalString (cfg.accessUser != "") reloadScript); serviceConfig = { Type = "oneshot"; User = jenkinsCfg.user; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index e8c96881673b5..578364ec542bb 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.minetest-server; - flag = val: name: if val != null then "--${name} ${toString val} " else ""; + flag = val: name: optionalString (val != null) "--${name} ${toString val} "; flags = [ (flag cfg.gameId "gameid") (flag cfg.world "world") diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index b056f96c3630b..342ac5ec6e049 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -83,9 +83,8 @@ let }; mailOption = - if foldr (n: a: a || (n.mail or false) != false) false (attrValues cfg.settings) - then "--mail=${pkgs.mailutils}/bin/mail" - else ""; + optionalString (foldr (n: a: a || (n.mail or false) != false) false (attrValues cfg.settings)) + "--mail=${pkgs.mailutils}/bin/mail"; in { imports = [ diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index 43969402588db..553973e255f7e 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -7,7 +7,7 @@ let cfg = config.services.syslogd; syslogConf = pkgs.writeText "syslog.conf" '' - ${if (cfg.tty != "") then "kern.warning;*.err;authpriv.none /dev/${cfg.tty}" else ""} + ${optionalString (cfg.tty != "") "kern.warning;*.err;authpriv.none /dev/${cfg.tty}"} ${cfg.defaultConfig} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 852340c05aa7a..23c47aaca7e23 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -234,7 +234,7 @@ let headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks; - aliases = let separator = if cfg.aliasMapType == "hash" then ":" else ""; in + aliases = let separator = optionalString (cfg.aliasMapType == "hash") ":"; in optionalString (cfg.postmasterAlias != "") '' postmaster${separator} ${cfg.postmasterAlias} '' diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 83f4efe695a27..eff725f5a8685 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -10,7 +10,7 @@ let Connection = ${cfg.device.connection} SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"} LogFormat = ${cfg.log.format} - ${if (cfg.device.pin != null) then "PIN = ${cfg.device.pin}" else ""} + ${optionalString (cfg.device.pin != null) "PIN = ${cfg.device.pin}"} ${cfg.extraConfig.gammu} @@ -33,10 +33,10 @@ let ${optionalString (cfg.backend.service == "sql" && cfg.backend.sql.driver == "native_pgsql") ( with cfg.backend; '' Driver = ${sql.driver} - ${if (sql.database!= null) then "Database = ${sql.database}" else ""} - ${if (sql.host != null) then "Host = ${sql.host}" else ""} - ${if (sql.user != null) then "User = ${sql.user}" else ""} - ${if (sql.password != null) then "Password = ${sql.password}" else ""} + ${optionalString (sql.database!= null) "Database = ${sql.database}"} + ${optionalString (sql.host != null) "Host = ${sql.host}"} + ${optionalString (sql.user != null) "User = ${sql.user}"} + ${optionalString (sql.password != null) "Password = ${sql.password}"} '')} ${cfg.extraConfig.smsd} diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index e019e431a1890..a5d7a73dd06aa 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -26,9 +26,18 @@ in imports = [ (mkRenamedOptionModule [ "services" "gitea" "cookieSecure" ] [ "services" "gitea" "settings" "session" "COOKIE_SECURE" ]) (mkRenamedOptionModule [ "services" "gitea" "disableRegistration" ] [ "services" "gitea" "settings" "service" "DISABLE_REGISTRATION" ]) + (mkRenamedOptionModule [ "services" "gitea" "domain" ] [ "services" "gitea" "settings" "server" "DOMAIN" ]) + (mkRenamedOptionModule [ "services" "gitea" "httpAddress" ] [ "services" "gitea" "settings" "server" "HTTP_ADDR" ]) + (mkRenamedOptionModule [ "services" "gitea" "httpPort" ] [ "services" "gitea" "settings" "server" "HTTP_PORT" ]) (mkRenamedOptionModule [ "services" "gitea" "log" "level" ] [ "services" "gitea" "settings" "log" "LEVEL" ]) (mkRenamedOptionModule [ "services" "gitea" "log" "rootPath" ] [ "services" "gitea" "settings" "log" "ROOT_PATH" ]) + (mkRenamedOptionModule [ "services" "gitea" "rootUrl" ] [ "services" "gitea" "settings" "server" "ROOT_URL" ]) (mkRenamedOptionModule [ "services" "gitea" "ssh" "clonePort" ] [ "services" "gitea" "settings" "server" "SSH_PORT" ]) + (mkRenamedOptionModule [ "services" "gitea" "staticRootPath" ] [ "services" "gitea" "settings" "server" "STATIC_ROOT_PATH" ]) + + (mkChangedOptionModule [ "services" "gitea" "enableUnixSocket" ] [ "services" "gitea" "settings" "server" "PROTOCOL" ] ( + config: if config.services.gitea.enableUnixSocket then "http+unix" else "http" + )) (mkRemovedOptionModule [ "services" "gitea" "ssh" "enable" ] "services.gitea.ssh.enable has been migrated into freeform setting services.gitea.settings.server.DISABLE_SSH. Keep in mind that the setting is inverted") ]; @@ -57,7 +66,14 @@ in stateDir = mkOption { default = "/var/lib/gitea"; type = types.str; - description = lib.mdDoc "gitea data directory."; + description = lib.mdDoc "Gitea data directory."; + }; + + customDir = mkOption { + default = "${cfg.stateDir}/custom"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/custom"''; + type = types.str; + description = lib.mdDoc "Gitea custom directory. Used for config, custom templates and other options."; }; user = mkOption { @@ -66,6 +82,12 @@ in description = lib.mdDoc "User account under which gitea runs."; }; + group = mkOption { + type = types.str; + default = "gitea"; + description = lib.mdDoc "Group under which gitea runs."; + }; + database = { type = mkOption { type = types.enum [ "sqlite3" "mysql" "postgres" ]; @@ -216,44 +238,6 @@ in description = lib.mdDoc "Path to the git repositories."; }; - domain = mkOption { - type = types.str; - default = "localhost"; - description = lib.mdDoc "Domain name of your server."; - }; - - rootUrl = mkOption { - type = types.str; - default = "http://localhost:3000/"; - description = lib.mdDoc "Full public URL of gitea server."; - }; - - httpAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = lib.mdDoc "HTTP listen address."; - }; - - httpPort = mkOption { - type = types.port; - default = 3000; - description = lib.mdDoc "HTTP listen port."; - }; - - enableUnixSocket = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Configure Gitea to listen on a unix socket instead of the default TCP port."; - }; - - staticRootPath = mkOption { - type = types.either types.str types.path; - default = cfg.package.data; - defaultText = literalExpression "package.data"; - example = "/var/lib/gitea/data"; - description = lib.mdDoc "Upper level of template and static files path."; - }; - mailerPasswordFile = mkOption { type = types.nullOr types.str; default = null; @@ -285,7 +269,7 @@ in }; } ''; - type = with types; submodule { + type = types.submodule { freeformType = format.type; options = { log = { @@ -303,6 +287,46 @@ in }; server = { + PROTOCOL = mkOption { + type = types.enum [ "http" "https" "fcgi" "http+unix" "fcgi+unix" ]; + default = "http"; + description = lib.mdDoc ''Listen protocol. `+unix` means "over unix", not "in addition to."''; + }; + + HTTP_ADDR = mkOption { + type = types.either types.str types.path; + default = if lib.hasSuffix "+unix" cfg.settings.server.PROTOCOL then "/run/gitea/gitea.sock" else "0.0.0.0"; + defaultText = literalExpression ''if lib.hasSuffix "+unix" cfg.settings.server.PROTOCOL then "/run/gitea/gitea.sock" else "0.0.0.0"''; + description = lib.mdDoc "Listen address. Must be a path when using a unix socket."; + }; + + HTTP_PORT = mkOption { + type = types.port; + default = 3000; + description = lib.mdDoc "Listen port. Ignored when using a unix socket."; + }; + + DOMAIN = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc "Domain name of your server."; + }; + + ROOT_URL = mkOption { + type = types.str; + default = "http://${cfg.settings.server.DOMAIN}:${toString cfg.settings.server.HTTP_PORT}/"; + defaultText = literalExpression ''"http://''${config.services.gitea.settings.server.DOMAIN}:''${toString config.services.gitea.settings.server.HTTP_PORT}/"''; + description = lib.mdDoc "Full public URL of gitea server."; + }; + + STATIC_ROOT_PATH = mkOption { + type = types.either types.str types.path; + default = cfg.package.data; + defaultText = literalExpression "config.${opt.package}.data"; + example = "/var/lib/gitea/data"; + description = lib.mdDoc "Upper level of template and static files path."; + }; + DISABLE_SSH = mkOption { type = types.bool; default = false; @@ -359,7 +383,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createDatabase -> cfg.database.user == cfg.user; + { assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; message = "services.gitea.database.user must match services.gitea.user if the database is to be automatically provisioned"; } ]; @@ -389,26 +413,10 @@ in ROOT = cfg.repositoryRoot; }; - server = mkMerge [ - { - DOMAIN = cfg.domain; - STATIC_ROOT_PATH = toString cfg.staticRootPath; - LFS_JWT_SECRET = "#lfsjwtsecret#"; - ROOT_URL = cfg.rootUrl; - } - (mkIf cfg.enableUnixSocket { - PROTOCOL = "http+unix"; - HTTP_ADDR = "/run/gitea/gitea.sock"; - }) - (mkIf (!cfg.enableUnixSocket) { - HTTP_ADDR = cfg.httpAddress; - HTTP_PORT = cfg.httpPort; - }) - (mkIf cfg.lfs.enable { - LFS_START_SERVER = true; - }) - - ]; + server = mkIf cfg.lfs.enable { + LFS_START_SERVER = true; + LFS_JWT_SECRET = "#lfsjwtsecret#"; + }; session = { COOKIE_NAME = lib.mkDefault "session"; @@ -428,7 +436,7 @@ in JWT_SECRET = "#oauth2jwtsecret#"; }; - lfs = mkIf (cfg.lfs.enable) { + lfs = mkIf cfg.lfs.enable { PATH = cfg.lfs.contentDir; }; }; @@ -457,33 +465,35 @@ in }; systemd.tmpfiles.rules = [ - "d '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" - "z '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" - "Z '${cfg.dump.backupDir}' - ${cfg.user} gitea - -" - "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -" - "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -" - "Z '${cfg.lfs.contentDir}' - ${cfg.user} gitea - -" - "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" - "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" - "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" - "d '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" - "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" - "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" - "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" - "d '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" - "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" - "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" - "Z '${cfg.stateDir}' - ${cfg.user} gitea - -" + "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -" + "Z '${cfg.dump.backupDir}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -" + "Z '${cfg.repositoryRoot}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -" + "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" # If we have a folder or symlink with gitea locales, remove it # And symlink the current gitea locales in place "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale" + + ] ++ lib.optionals cfg.lfs.enable [ + "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -" + "Z '${cfg.lfs.contentDir}' - ${cfg.user} ${cfg.group} - -" ]; systemd.services.gitea = { @@ -500,47 +510,52 @@ in # lfs_jwt_secret. # We have to consider this to stay compatible with older installations. preStart = let - runConfig = "${cfg.stateDir}/custom/conf/app.ini"; - secretKey = "${cfg.stateDir}/custom/conf/secret_key"; - oauth2JwtSecret = "${cfg.stateDir}/custom/conf/oauth2_jwt_secret"; - oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET - lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET - internalToken = "${cfg.stateDir}/custom/conf/internal_token"; + runConfig = "${cfg.customDir}/conf/app.ini"; + secretKey = "${cfg.customDir}/conf/secret_key"; + oauth2JwtSecret = "${cfg.customDir}/conf/oauth2_jwt_secret"; + oldLfsJwtSecret = "${cfg.customDir}/conf/jwt_secret"; # old file for LFS_JWT_SECRET + lfsJwtSecret = "${cfg.customDir}/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET + internalToken = "${cfg.customDir}/conf/internal_token"; replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret"; in '' - # copy custom configuration and generate a random secret key if needed + # copy custom configuration and generate random secrets if needed ${optionalString (!cfg.useWizard) '' function gitea_setup { - cp -f ${configFile} ${runConfig} + cp -f '${configFile}' '${runConfig}' - if [ ! -s ${secretKey} ]; then - ${exe} generate secret SECRET_KEY > ${secretKey} + if [ ! -s '${secretKey}' ]; then + ${exe} generate secret SECRET_KEY > '${secretKey}' fi # Migrate LFS_JWT_SECRET filename - if [[ -s ${oldLfsJwtSecret} && ! -s ${lfsJwtSecret} ]]; then - mv ${oldLfsJwtSecret} ${lfsJwtSecret} + if [[ -s '${oldLfsJwtSecret}' && ! -s '${lfsJwtSecret}' ]]; then + mv '${oldLfsJwtSecret}' '${lfsJwtSecret}' fi - if [ ! -s ${oauth2JwtSecret} ]; then - ${exe} generate secret JWT_SECRET > ${oauth2JwtSecret} + if [ ! -s '${oauth2JwtSecret}' ]; then + ${exe} generate secret JWT_SECRET > '${oauth2JwtSecret}' fi - if [ ! -s ${lfsJwtSecret} ]; then - ${exe} generate secret LFS_JWT_SECRET > ${lfsJwtSecret} + ${lib.optionalString cfg.lfs.enable '' + if [ ! -s '${lfsJwtSecret}' ]; then + ${exe} generate secret LFS_JWT_SECRET > '${lfsJwtSecret}' fi + ''} - if [ ! -s ${internalToken} ]; then - ${exe} generate secret INTERNAL_TOKEN > ${internalToken} + if [ ! -s '${internalToken}' ]; then + ${exe} generate secret INTERNAL_TOKEN > '${internalToken}' fi chmod u+w '${runConfig}' ${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}' ${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}' ${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}' - ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}' ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}' + ${lib.optionalString cfg.lfs.enable '' + ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'" + ''} + ${lib.optionalString (cfg.mailerPasswordFile != null) '' ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}' ''} @@ -565,7 +580,7 @@ in serviceConfig = { Type = "simple"; User = cfg.user; - Group = "gitea"; + Group = cfg.group; WorkingDirectory = cfg.stateDir; ExecStart = "${exe} web --pid /run/gitea/gitea.pid"; Restart = "always"; @@ -573,7 +588,7 @@ in RuntimeDirectory = "gitea"; RuntimeDirectoryMode = "0755"; # Access write directories - ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; + ReadWritePaths = [ cfg.customDir cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; UMask = "0027"; # Capabilities CapabilityBoundingSet = ""; @@ -606,6 +621,7 @@ in USER = cfg.user; HOME = cfg.stateDir; GITEA_WORK_DIR = cfg.stateDir; + GITEA_CUSTOM = cfg.customDir; }; }; @@ -614,12 +630,14 @@ in description = "Gitea Service"; home = cfg.stateDir; useDefaultShell = true; - group = "gitea"; + group = cfg.group; isSystemUser = true; }; }; - users.groups.gitea = {}; + users.groups = mkIf (cfg.group == "gitea") { + gitea = {}; + }; warnings = optional (cfg.database.password != "") "config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead." ++ diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d278b571a6410..12c67c5f5a1e7 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1215,7 +1215,7 @@ in { enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly extraConfig = { auth.token = { - realm = "http${if cfg.https == true then "s" else ""}://${cfg.host}/jwt/auth"; + realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth"; service = cfg.registry.serviceName; issuer = cfg.registry.issuer; rootcertbundle = cfg.registry.certFile; diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 1a6b54854d1cd..e75c352541438 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.mbpfan; - verbose = if cfg.verbose then "v" else ""; + verbose = optionalString cfg.verbose "v"; settingsFormat = pkgs.formats.ini {}; settingsFile = settingsFormat.generate "mbpfan.ini" cfg.settings; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 58a595b5c76f5..d881ea913695c 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -283,13 +283,13 @@ in services.redmine.settings = { production = { - scm_subversion_command = if cfg.components.subversion then "${pkgs.subversion}/bin/svn" else ""; - scm_mercurial_command = if cfg.components.mercurial then "${pkgs.mercurial}/bin/hg" else ""; - scm_git_command = if cfg.components.git then "${pkgs.git}/bin/git" else ""; - scm_cvs_command = if cfg.components.cvs then "${pkgs.cvs}/bin/cvs" else ""; - scm_bazaar_command = if cfg.components.breezy then "${pkgs.breezy}/bin/bzr" else ""; - imagemagick_convert_command = if cfg.components.imagemagick then "${pkgs.imagemagick}/bin/convert" else ""; - gs_command = if cfg.components.ghostscript then "${pkgs.ghostscript}/bin/gs" else ""; + scm_subversion_command = optionalString cfg.components.subversion "${pkgs.subversion}/bin/svn"; + scm_mercurial_command = optionalString cfg.components.mercurial "${pkgs.mercurial}/bin/hg"; + scm_git_command = optionalString cfg.components.git "${pkgs.git}/bin/git"; + scm_cvs_command = optionalString cfg.components.cvs "${pkgs.cvs}/bin/cvs"; + scm_bazaar_command = optionalString cfg.components.breezy "${pkgs.breezy}/bin/bzr"; + imagemagick_convert_command = optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert"; + gs_command = optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs"; minimagick_font_path = "${cfg.components.minimagick_font_path}"; }; }; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index f1a1ed4d29b38..99b25bdb8e9ed 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -20,7 +20,7 @@ let ${optionalString (cfg.hostsAllowReg != []) "hosts_allow_reg = ${concatStringsSep "," cfg.hostsAllowReg}"} ${optionalString (cfg.hostsAllowSip != []) "hosts_allow_sip = ${concatStringsSep "," cfg.hostsAllowSip}"} ${optionalString (cfg.hostsDenySip != []) "hosts_deny_sip = ${concatStringsSep "," cfg.hostsDenySip}"} - ${if (cfg.passwordFile != "") then "proxy_auth_pwfile = ${cfg.passwordFile}" else ""} + ${optionalString (cfg.passwordFile != "") "proxy_auth_pwfile = ${cfg.passwordFile}"} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 0c2de683ecf72..f67596f05a3a1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -58,10 +58,10 @@ in }; }; serviceOpts = let - collectSettingsArgs = if (cfg.collectdBinary.enable) then '' + collectSettingsArgs = optionalString (cfg.collectdBinary.enable) '' --collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ --collectd.security-level ${cfg.collectdBinary.securityLevel} \ - '' else ""; + ''; in { serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix index 80628f4dfaf29..e5e147a8dc338 100644 --- a/nixos/modules/services/network-filesystems/openafs/lib.nix +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -1,13 +1,13 @@ { config, lib, ...}: let - inherit (lib) concatStringsSep mkOption types; + inherit (lib) concatStringsSep mkOption types optionalString; in { mkCellServDB = cellName: db: '' >${cellName} - '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "") + '' + (concatStringsSep "\n" (map (dbm: optionalString (dbm.ip != "" && dbm.dnsname != "") "${dbm.ip} #${dbm.dnsname}") db)) + "\n"; diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 98c58d2d5db1b..d221c95ae6200 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -17,7 +17,7 @@ let ttl ${toString proxy.ttl} ${render proxy.rules (ruleNetworkName: rule: '' rule ${prefer rule.network ruleNetworkName} { - ${rule.method}${if rule.method == "iface" then " ${rule.interface}" else ""} + ${rule.method}${optionalString (rule.method == "iface") " ${rule.interface}"} }'')} }'')} ''); diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index e6344d7ff3b34..bf7ec19f02a68 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -86,7 +86,7 @@ in redis.createInstance = mkOption { type = types.nullOr types.str; - default = if versionAtLeast config.system.stateVersion "22.05" then "ntopng" else ""; + default = optionalString (versionAtLeast config.system.stateVersion "22.05") "ntopng"; description = lib.mdDoc '' Local Redis instance name. Set to `null` to disable local Redis instance. Defaults to `""` for diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 7932bac9ca3a1..af64969c2fcd4 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -169,11 +169,11 @@ in else (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \ -h "${hostKey}" \ - ${if !syslog then "--no-syslog" else ""} \ + ${optionalString (!syslog) "--no-syslog" } \ ${if passwordAuthentication then "--password" else "--no-password" } \ ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \ ${if rootLogin then "--root-login" else "--no-root-login" } \ - ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \ + ${optionalString (loginShell != null) "--login-shell=\"${loginShell}\"" } \ ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \ ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \ ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \ diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 4ec89be82b701..89ddf82152993 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -474,10 +474,10 @@ in mkdir -m 0755 -p "$(dirname '${k.path}')" ssh-keygen \ -t "${k.type}" \ - ${if k ? bits then "-b ${toString k.bits}" else ""} \ - ${if k ? rounds then "-a ${toString k.rounds}" else ""} \ - ${if k ? comment then "-C '${k.comment}'" else ""} \ - ${if k ? openSSHFormat && k.openSSHFormat then "-o" else ""} \ + ${optionalString (k ? bits) "-b ${toString k.bits}"} \ + ${optionalString (k ? rounds) "-a ${toString k.rounds}"} \ + ${optionalString (k ? comment) "-C '${k.comment}'"} \ + ${optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \ -f "${k.path}" \ -N "" fi @@ -550,7 +550,7 @@ in '') cfg.ports} ${concatMapStrings ({ port, addr, ... }: '' - ListenAddress ${addr}${if port != null then ":" + toString port else ""} + ListenAddress ${addr}${optionalString (port != null) (":" + toString port)} '') cfg.listenAddresses} ${optionalString cfgc.setXAuthLocation '' diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8b1398bfd47d4..e58526814d1ad 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -4,7 +4,7 @@ let inherit (builtins) toFile; inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList - mkIf mkEnableOption mkOption types literalExpression; + mkIf mkEnableOption mkOption types literalExpression optionalString; cfg = config.services.strongswan; @@ -34,8 +34,8 @@ let strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { - ${if managePlugins then "load_modular = no" else ""} - ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} + ${optionalString managePlugins "load_modular = no"} + ${optionalString managePlugins ("load = " + (concatStringsSep " " enabledPlugins))} plugins { stroke { secrets_file = ${secretsFile} diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index 4f592fb312d33..996e9b2253921 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -154,8 +154,8 @@ in environment.systemPackages = [ pkgs.stunnel ]; environment.etc."stunnel.cfg".text = '' - ${ if cfg.user != null then "setuid = ${cfg.user}" else "" } - ${ if cfg.group != null then "setgid = ${cfg.group}" else "" } + ${ optionalString (cfg.user != null) "setuid = ${cfg.user}" } + ${ optionalString (cfg.group != null) "setgid = ${cfg.group}" } debug = ${cfg.logLevel} diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index b9120f37ba247..fb3de7077e31e 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -27,7 +27,7 @@ let ${optionalString srv.unlisted "type = UNLISTED"} ${optionalString (srv.flags != "") "flags = ${srv.flags}"} socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"} - ${if srv.port != 0 then "port = ${toString srv.port}" else ""} + ${optionalString (srv.port != 0) "port = ${toString srv.port}"} wait = ${if srv.protocol == "udp" then "yes" else "no"} user = ${srv.user} server = ${srv.server} diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 1962d3f59c9f5..93962d40ce4b4 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -209,6 +209,20 @@ in ''; }; + extraSettings = mkOption { + type = with types; attrsOf (oneOf [ bool ints.positive str ]); + default = {}; + description = lib.mdDoc '' + Extra default configuration for all jails (i.e. `[DEFAULT]`). See + <https://github.com/fail2ban/fail2ban/blob/master/config/jail.conf> for an overview. + ''; + example = literalExpression '' + { + findtime = "15m"; + } + ''; + }; + jails = mkOption { default = { }; example = literalExpression '' @@ -335,6 +349,10 @@ in # Actions banaction = ${cfg.banaction} banaction_allports = ${cfg.banaction-allports} + ${optionalString (cfg.extraSettings != {}) '' + # Extra settings + ${generators.toKeyValue {} cfg.extraSettings} + ''} ''; # Block SSH if there are too many failing connection attempts. # Benefits from verbose sshd logging to observe failed login attempts, diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index e3f8e75ca2476..12547acabfe05 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -72,15 +72,14 @@ let } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; mapConfig = key: attr: - if attr != null && attr != [] then ( + optionalString (attr != null && attr != []) ( if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else - "--${key}=${toString attr}") - else ""; + "--${key}=${toString attr}"); configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig); in diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 11769d4e3095f..06494ddb631af 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -72,7 +72,7 @@ in { EnvironmentFile = cfg.credentialsFile; ExecStart = '' ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \ - deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""} + deploy agent ${cfg.name} ${optionalString (cfg.profile != null) cfg.profile} ''; }; }; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 151fb812ddea6..5b2bd5aeeb09c 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -1025,8 +1025,8 @@ in services.postfix = lib.mkIf cfg.mail.incoming.enable { enable = true; - sslCert = if cfg.sslCertificate != null then cfg.sslCertificate else ""; - sslKey = if cfg.sslCertificateKey != null then cfg.sslCertificateKey else ""; + sslCert = lib.optionalString (cfg.sslCertificate != null) cfg.sslCertificate; + sslKey = lib.optionalString (cfg.sslCertificateKey != null) cfg.sslCertificateKey; origin = cfg.hostname; relayDomains = [ cfg.hostname ]; diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index f9c91fb35db23..3a57ef383065b 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -54,7 +54,7 @@ in { serviceConfig = { ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${ - if (cfg.socketType != "unix") then "-s ${cfg.socketType}:${cfg.socketAddress}" else "" + optionalString (cfg.socketType != "unix") "-s ${cfg.socketType}:${cfg.socketAddress}" }"; } // (if cfg.user != null && cfg.group != null then { User = cfg.user; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 811afe8e0af66..0438e12e7da82 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -64,7 +64,7 @@ let ]; maybeModuleString = moduleName: - if elem moduleName cfg.enableModules then ''"${moduleName}"'' else ""; + optionalString (elem moduleName cfg.enableModules) ''"${moduleName}"''; modulesIncludeString = concatStringsSep ",\n" (filter (x: x != "") (map maybeModuleString allKnownModules)); @@ -106,15 +106,15 @@ let static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" ) index-file.names = ( "index.html" ) - ${if cfg.mod_userdir then '' + ${optionalString cfg.mod_userdir '' userdir.path = "public_html" - '' else ""} + ''} - ${if cfg.mod_status then '' + ${optionalString cfg.mod_status '' status.status-url = "/server-status" status.statistics-url = "/server-statistics" status.config-url = "/server-config" - '' else ""} + ''} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 3d19186e1a9d3..4f97fe752ef70 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -318,7 +318,7 @@ let listenString = { addr, port, ssl, extraParameters ? [], ... }: # UDP listener for QUIC transport protocol. - (if ssl && vhost.quic then " + (optionalString (ssl && vhost.quic) " listen ${addr}:${toString port} quic " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " @@ -326,7 +326,7 @@ let let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ]; isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters); in filter isCompatibleParameter extraParameters)) - + ";" else "") + + ";") + " listen ${addr}:${toString port} " diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index d8bfee547c79a..4d2c36287be69 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -234,11 +234,11 @@ in ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i` done - ${if cfg.extraConfigFiles != [] then '' + ${optionalString (cfg.extraConfigFiles != []) '' for i in ${toString cfg.extraConfigFiles}; do ln -sfn $i ${cfg.baseDir}/conf/`basename $i` done - '' else ""} + ''} # Create a modified catalina.properties file # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries @@ -345,7 +345,7 @@ in # Symlink all the given web applications files or paths into the webapps/ directory # of this virtual host - for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"; do + for i in "${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` diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 121d7e88e74de..5c0a07fb51272 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -33,7 +33,7 @@ let then realGrub.override { efiSupport = cfg.efiSupport; } else null; - f = x: if x == null then "" else "" + x; + f = x: optionalString (x != null) ("" + x); grubConfig = args: let @@ -52,7 +52,7 @@ let fullName = lib.getName realGrub; fullVersion = lib.getVersion realGrub; grubEfi = f grubEfi; - grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; + grubTargetEfi = optionalString (cfg.efiSupport && (cfg.version == 2)) (f (grubEfi.grubTarget or "")); bootPath = args.path; storePath = config.boot.loader.grub.storePath; bootloaderId = if args.efiBootloaderId == null then "${config.system.nixos.distroName}${efiSysMountPoint'}" else args.efiBootloaderId; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 757dc080d4b61..8a3e89e5888bc 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -20,7 +20,7 @@ let nix = config.nix.package.out; - timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else ""; + timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout; editor = if cfg.editor then "True" else "False"; @@ -32,9 +32,9 @@ let inherit (config.system.nixos) distroName; - memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; + memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86-efi; - netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else ""; + netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi; copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' empty_file=$(${pkgs.coreutils}/bin/mktemp) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8954c90812f92..b8f36538e70fe 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -1024,13 +1024,12 @@ in copy_bin_and_libs ${pkgs.gnupg}/libexec/scdaemon ${concatMapStringsSep "\n" (x: - if x.gpgCard != null then + optionalString (x.gpgCard != null) '' mkdir -p $out/secrets/gpg-keys/${x.device} cp -a ${x.gpgCard.encryptedPass} $out/secrets/gpg-keys/${x.device}/cryptkey.gpg cp -a ${x.gpgCard.publicKey} $out/secrets/gpg-keys/${x.device}/pubkey.asc '' - else "" ) (attrValues luks.devices) } ''} diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 822f1593474eb..326862f836a5c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -319,7 +319,7 @@ in message = let fs = head (filter notAutoResizable fileSystems); in - "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${if fs.fsType == "auto" then " fsType has to be explicitly set and" else ""} only the ext filesystems and f2fs support it."; + "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${optionalString (fs.fsType == "auto") " fsType has to be explicitly set and"} only the ext filesystems and f2fs support it."; } ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 669981da59740..d54e2ed3f3ae1 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -170,11 +170,11 @@ let --setenv HOST_PORT="$HOST_PORT" \ --setenv PATH="$PATH" \ ${optionalString cfg.ephemeral "--ephemeral"} \ - ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then - ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else "" + ${optionalString (cfg.additionalCapabilities != null && cfg.additionalCapabilities != []) + ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' } \ - ${if cfg.tmpfs != null && cfg.tmpfs != [] then - ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" + ${optionalString (cfg.tmpfs != null && cfg.tmpfs != []) + ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' } \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 89772019284cb..1619c0d9410fb 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -214,11 +214,11 @@ let mkdir $out diskImage=$out/disk.img ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M" - ${if cfg.useEFIBoot then '' + ${lib.optionalString cfg.useEFIBoot '' efiVars=$out/efi-vars.fd cp ${cfg.efi.variables} $efiVars chmod 0644 $efiVars - '' else ""} + ''} ''; buildInputs = [ pkgs.util-linux ]; QEMU_OPTS = "-nographic -serial stdio -monitor none" diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 4f7052f9156fc..1c7a382cb385c 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, fetchFromGitLab +, fetchpatch , gitUpdater , python3Packages , blueprint-compiler @@ -38,7 +38,15 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-8VF/CD0Wu2eV6wOpj/M6peKDthFWlcg+1NzzTSIH4S8="; }; - patches = [ ./vulkan_icd.patch ]; + patches = [ + ./vulkan_icd.patch + + # Remove next version + (fetchpatch { + url = "https://github.com/bottlesdevs/Bottles/commit/7cb284f9bac0b71bf632bfc70d94f7a53bc51267.patch"; + hash = "sha256-mRF+BtQ0qM7Yvx7SONeH2wc04F87fEyNRlBuyQrzN8Y="; + }) + ]; # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 8234a77ba1456..5200907ff0dbb 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -1,40 +1,44 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config -, gnome-desktop, gnupg, gtk3, udisks +{ lib, stdenv, fetchFromGitHub, writeText +, glib, meson, ninja, pkg-config, python3 +, coreutils, gnome-desktop, gnupg, gtk3, systemdMinimal, udisks }: stdenv.mkDerivation rec { pname = "eos-installer"; - version = "4.0.3"; + version = "5.0.2"; src = fetchFromGitHub { owner = "endlessm"; repo = "eos-installer"; rev = "Release_${version}"; - sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; + sha256 = "utTTux8o8TN51bvnGldrtMEatiLA1AiHf/9XJZ7k7KM="; fetchSubmodules = true; }; strictDeps = true; nativeBuildInputs = [ - autoconf autoconf-archive automake glib intltool libtool pkg-config + glib gnupg meson ninja pkg-config python3 ]; - buildInputs = [ gnome-desktop gtk3 udisks ]; + buildInputs = [ gnome-desktop gtk3 systemdMinimal udisks ]; preConfigure = '' - ./autogen.sh + patchShebangs tests + substituteInPlace tests/test-scribe.c \ + --replace /bin/true ${coreutils}/bin/true \ + --replace /bin/false ${coreutils}/bin/false ''; - configureFlags = [ + mesonFlags = [ "--libexecdir=${placeholder "out"}/bin" - "--localstatedir=/var" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--cross-file=${writeText "crossfile.ini" '' + [binaries] + gpg = '${gnupg}/bin/gpg' + ''}" ]; - # These are for runtime, so can't be discovered from PATH, which - # is constructed from nativeBuildInputs. - GPG_PATH = "${gnupg}/bin/gpg"; - GPGCONF_PATH = "${gnupg}/bin/gpgconf"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index 368532dbef4e7..449301c0602ee 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildGoModule, fetchFromGitHub }: let - version = "1.4.8"; + version = "1.5.2"; in buildGoModule { pname = "ktunnel"; @@ -10,14 +10,14 @@ buildGoModule { owner = "omrikiei"; repo = "ktunnel"; rev = "v${version}"; - sha256 = "sha256-Iw7Z4iuKxmRrS51KP3k/ouXW4xssdNgxDDzNQR2Zygg="; + sha256 = "sha256-QZL3TSvxSPuBjjATAqoAOZNBSB6NCGfHHG2dq8C4Wwk="; }; ldflags = [ "-s" "-w" ]; - vendorSha256 = "sha256-p9AYZWNO2oqLich0qzZYuAk55HqB6ttS66ORuNZ4rJg="; + vendorHash = "sha256-Q8t/NWGeUB1IpxdsxvyvbYh/adtcA4p+7bcCy9YFjsw="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 5c95cfb568387..dfdc7fbb1870b 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.219"; + version = "1.2.224"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-yenIGKN6OoDxPRn4aHOQu8Msp1WzjLZzTZkSSKq1zlc="; + hash = "sha256-j7Lio56CMC4bJ58Oucm1hCqFNzMeoDpDRh/ALmF9Y3Y="; }; - vendorHash = "sha256-lif2Vj8HQH8rZeBIky1lz5J6ISdV2yPyR1vQrPcZLuU="; + vendorHash = "sha256-SdBWW1tv3OauCex8l6Kg7uKLFUOvDvCE8rnULytndqw="; proxyVendor = true; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index bc15b2ef29ade..c7bc47a9f045d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.4.0"; + version = "23.4.6"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-8gSy7WL0wpLAXxVo3oOA9X12qd/R7P3MgmlwXxpJSUs="; + sha256 = "sha256-lfQkY/B+mv+hUeAfmZkZ2BHq7MjR0MUVNPjk5QCGisE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 65175bd35aa38..5351b6c442a54 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -179,7 +179,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cloud-hypervisor" -version = "31.0.0" +version = "31.1.0" dependencies = [ "anyhow", "api_client", @@ -545,8 +545,7 @@ dependencies = [ [[package]] name = "kvm-ioctls" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8dc9c1896e5f144ec5d07169bc29f39a047686d29585a91f30489abfaeb6b" +source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#23a3bb045a467e60bb00328a0b13cea13b5815d0" dependencies = [ "kvm-bindings", "libc", diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7991b86c6936c..abfa0b02d3eb9 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "31.0"; + version = "31.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "RDHrBu8ePpFkN7BkTbqe2EXNNW7q96zNrjo269K1Zdo="; + sha256 = "vQa43ic3pRzRfT8S9LQIO+VIo6AS2tEMT16CDrMw8R0="; }; cargoLock = { @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "acpi_tables-0.1.0" = "sha256-hP9Fi1K6hX0PkOuomjIzY+oOiPO/5YSNzo0Z98Syz2A="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; + "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; "micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew="; "mshv-bindings-0.1.1" = "sha256-NwLPzX23nOe00qGoj1rLCWsJ5xEMmPUEtPVZNAYorWQ="; "versionize_derive-0.1.4" = "sha256-BPl294UqjVl8tThuvylXUFjFNjJx8OSfBGJLg8jIkWw="; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c882493d8c3a9..bef33e219b4dc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages -, perl, pixman, vde2, alsa-lib, texinfo, flex +, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet -, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows +, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner @@ -37,31 +37,37 @@ , qemu # for passthru.tests }: +let + hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; +in + stdenv.mkDerivation rec { pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "7.2.1"; + version = "8.0.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "jIVpms+dekOl/immTN1WNwsMLRrQdLr3CYqCTReq1zs="; + sha256 = "u2DwNBUxGB1sw5ad0ZoBPQQnqH+RgZOXDZrbkRMeVtA="; }; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja perl + pkg-config flex bison meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] + ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; - buildInputs = [ zlib glib perl pixman + buildInputs = [ zlib glib pixman vde2 texinfo lzo snappy libtasn1 gnutls nettle curl libslirp ] @@ -117,15 +123,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) - # glibc >=2.37 compat, see https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/ - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a.patch"; - sha256 = "sha256-1iWOWkLH0WP1Hk23fmrRVdX7YZWUXOvWRMTt8QM93BI="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e.patch"; - sha256 = "sha256-DKGCbR+VDIFLp6FhER78gyJ3Rn1dD47pMtkcIIMd0B8="; - }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; @@ -241,8 +238,6 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm - '' + lib.optionalString stdenv.isLinux '' - ln -s $out/libexec/virtiofsd $out/bin ''; passthru = { @@ -262,6 +257,5 @@ stdenv.mkDerivation rec { mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; - priority = 10; # Prefer virtiofsd from the virtiofsd package. }; } diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch index 98cc09d720032..dc4f4abb27383 100644 --- a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch +++ b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch @@ -1,4 +1,4 @@ -From 747a741772cde6bb340eb8bdb493390280de8d16 Mon Sep 17 00:00:00 2001 +From 2ec149ea3f0046fa83e3be74aca192649a60be47 Mon Sep 17 00:00:00 2001 From: Keno Fischer <keno@juliacomputing.com> Date: Sat, 16 Jun 2018 20:56:54 -0400 Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat @@ -29,23 +29,23 @@ Signed-off-by: Will Cohen <wwcohen@gmail.com> 4 files changed, 111 insertions(+), 1 deletion(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index d42ce6d8b8..b2c1fa42e1 100644 +index 9d07620235..9c77a431d5 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c -@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, +@@ -1081,7 +1081,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, goto out; } -- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); +- ret = qemu_utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); + ret = utimensat_nofollow(dirfd, name, buf); close_preserve_errno(dirfd); out: g_free(dirpath); diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c -index bec0253474..2fc0475292 100644 +index 95146e7354..74ab2a7f99 100644 --- a/hw/9pfs/9p-util-darwin.c +++ b/hw/9pfs/9p-util-darwin.c -@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) +@@ -145,3 +145,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) } #endif @@ -160,12 +160,12 @@ index db451b0784..320697f347 100644 + return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); +} diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h -index 97e681e167..fd50d6243a 100644 +index c314cf381d..12d57f3398 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h -@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name, - #define qemu_lsetxattr lsetxattr - #endif +@@ -101,6 +101,12 @@ static inline int errno_to_dotl(int err) { + #define qemu_utimensat utimensat + #define qemu_unlinkat unlinkat +/* Compatibility with old SDK Versions for Darwin */ +#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) @@ -176,7 +176,7 @@ index 97e681e167..fd50d6243a 100644 static inline void close_preserve_errno(int fd) { int serrno = errno; -@@ -98,6 +104,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, +@@ -163,6 +169,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, char *list, size_t size); ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, const char *name); @@ -186,5 +186,4 @@ index 97e681e167..fd50d6243a 100644 /* * Darwin has d_seekoff, which appears to function similarly to d_off. -- -2.35.1 - +2.39.2 diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 59620b16a6ccf..8ff9344b3f522 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-02-06"; + version = "unstable-2023-03-26"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "ccaa76761a1b100e99287c120196bd5f32d4a403"; - hash = "sha256-RL/94dQiZJ60cXHQ9r4P3hRBqe55oUissCmSp4XLM+o="; + rev = "eac67db33b2111f19ac267585032df8b4838e6f4"; + hash = "sha256-FBoagGHWsxZo40gOqeBUw0L+LtNAVF/q6IZ3N9QBFQs="; }; dontBuild = true; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d63e66d45f30a..91ec5b8a71d87 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "88252bfad2741817b521acc02a424b878264bf9f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88252bfad2741817b521acc02a424b878264bf9f.tar.gz", - "sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm", - "msg": "Update from Hackage at 2023-04-13T09:45:26Z" + "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", + "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", + "msg": "Update from Hackage at 2023-04-18T09:14:41Z" } diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index f3e14f9c1bd22..c242006467db0 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.28.2"; + version = "0.28.3"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4sYHI3yh5KvLxdpWkCMya7v5aXG+FvvK7hmpOkX1R28="; + hash = "sha256-3uHR6W2Vbqen9e6OXEFFl91/LzXCix4alnprFB36yes="; }; nativeBuildInputs = [ git pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-7RLeLZS28eIGObisRRI3skSkplWZGnyikvD3qfFDpU8="; + cargoHash = "sha256-3+Jb/POABFIBkKpaTD9JDc1vrDzsJe9mGRBQR3UnDAg="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 9b7811417d9f6..54aa44efb4885 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -38,6 +38,11 @@ self: super: { happy = dontCheck super.happy; happy_1_19_12 = doDistribute (dontCheck super.happy_1_19_12); + # add arm specific library + wiringPi = overrideCabal ({librarySystemDepends ? [], ...}: { + librarySystemDepends = librarySystemDepends ++ [pkgs.wiringpi]; + }) super.wiringPi; + } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # AARCH64-SPECIFIC OVERRIDES diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 334b41bdee1e6..b166dd14de734 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2489,7 +2489,7 @@ self: super: { # 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12 # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3 swarm = doJailbreak (super.swarm.override { - brick = doJailbreak (dontCheck super.brick_1_6); + brick = doJailbreak (dontCheck super.brick_1_7); }); # Too strict upper bound on bytestring diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 168e8cc9a77e1..95d9c567b7ef9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -62,8 +62,6 @@ in { ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen); - lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; - haskell-src-meta = doJailbreak super.haskell-src-meta; # Tests fail in GHC 9.2 @@ -211,7 +209,7 @@ in { # https://github.com/tweag/ormolu/issues/941 fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455 # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8170c9d1555d7..3824cf51dbe23 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4975,6 +4975,7 @@ broken-packages: - softfloat-hs - solar - solga + - som # test failure in job https://hydra.nixos.org/build/216744749 at 2023-04-20 - Sonnex - sorted - sorting @@ -5254,6 +5255,7 @@ broken-packages: - tasty-hedgehog-coverage - tasty-json - tasty-mgolden + - tasty-papi # test failure in job https://hydra.nixos.org/build/216756583 at 2023-04-20 - tasty-stats - tasty-test-vector - TastyTLT @@ -5701,6 +5703,7 @@ broken-packages: - vector-fftw - vector-functorlazy - vector-heterogenous + - vector-quicksort # dependency missing in job https://hydra.nixos.org/build/216753081 at 2023-04-20 - vector-random - vector-read-instances - vector-space-map diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index da366910a8d7e..fc1da79172ff9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -134,7 +134,7 @@ extra-packages: - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now - - fourmolu == 0.10.0.0 # 2023-04-03: for hls-fourmolu-plugin 1.1.1.0 + - fourmolu == 0.10.1.0 # 2023-04-18: for hls-fourmolu-plugin 1.1.1.0 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index ac43489e38ec5..9c1ebda9f7a41 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.17 +# Stackage LTS 20.18 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -8,7 +8,7 @@ default-package-overrides: - AC-Angle ==1.0 - acc ==0.2.0.1 - ace ==0.6 - - acid-state ==0.16.1.1 + - acid-state ==0.16.1.2 - action-permutations ==0.0.0.1 - active ==0.2.0.17 - ad ==4.5.4 @@ -43,7 +43,7 @@ default-package-overrides: - al ==0.1.4.2 - alarmclock ==0.7.0.6 - alerts ==0.1.2.0 - - alex ==3.2.7.1 + - alex ==3.2.7.2 - alex-meta ==0.3.0.13 - algebra ==4.3.1 - algebraic-graphs ==0.6.1 @@ -446,8 +446,8 @@ default-package-overrides: - convertible ==1.1.1.1 - cookie ==0.4.6 - copr-api ==0.1.0 - - core-data ==0.3.9.0 - - core-program ==0.6.5.0 + - core-data ==0.3.9.1 + - core-program ==0.6.5.1 - core-telemetry ==0.2.8.0 - core-text ==0.3.8.1 - countable ==1.2 @@ -554,7 +554,7 @@ default-package-overrides: - dawg-ord ==0.5.1.2 - dbcleaner ==0.1.3 - DBFunctor ==0.1.2.1 - - dbus ==1.2.27 + - dbus ==1.2.28 - dbus-hslogger ==0.1.0.1 - debian ==4.0.4 - debian-build ==0.10.2.1 @@ -771,7 +771,7 @@ default-package-overrides: - filecache ==0.4.1 - file-embed ==0.0.15.0 - file-embed-lzma ==0.0.1 - - filelock ==0.1.1.5 + - filelock ==0.1.1.6 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - filepath-bytestring ==1.4.2.1.12 @@ -1047,7 +1047,7 @@ default-package-overrides: - hasql-dynamic-statements ==0.3.1.2 - hasql-implicits ==0.1.1 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.0.3 + - hasql-notifications ==0.2.0.4 - hasql-optparse-applicative ==0.5 - hasql-pool ==0.8.0.7 - hasql-queue ==1.2.0.2 @@ -1301,7 +1301,7 @@ default-package-overrides: - inbox ==0.2.0 - include-file ==0.1.0.4 - incremental ==0.3.1 - - incremental-parser ==0.5.0.4 + - incremental-parser ==0.5.0.5 - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-containers ==0.1.0.2 @@ -1398,7 +1398,7 @@ default-package-overrides: - keep-alive ==0.2.1.0 - keycode ==0.2.2 - keys ==3.12.3 - - ki ==1.0.0.2 + - ki ==1.0.1.0 - kind-apply ==0.3.2.1 - kind-generics ==0.4.1.4 - kind-generics-th ==0.2.2.3 @@ -1509,7 +1509,7 @@ default-package-overrides: - lua ==2.2.1 - lua-arbitrary ==1.0.1.1 - lucid2 ==0.0.20221012 - - lucid ==2.11.1 + - lucid ==2.11.20230408 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 - lukko ==0.1.1.3 @@ -1576,7 +1576,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.3 - microlens-platform ==0.4.2.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.11 + - microlens-th ==0.4.3.12 - microspec ==0.2.1.3 - microstache ==1.0.2.3 - midair ==0.2.0.1 @@ -1652,15 +1652,15 @@ default-package-overrides: - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.2.0 - more-containers ==0.2.2.2 - - morpheus-graphql ==0.27.0 - - morpheus-graphql-app ==0.27.0 - - morpheus-graphql-client ==0.27.0 - - morpheus-graphql-code-gen ==0.27.0 - - morpheus-graphql-code-gen-utils ==0.27.0 - - morpheus-graphql-core ==0.27.0 - - morpheus-graphql-server ==0.27.0 - - morpheus-graphql-subscriptions ==0.27.0 - - morpheus-graphql-tests ==0.27.0 + - morpheus-graphql ==0.27.1 + - morpheus-graphql-app ==0.27.1 + - morpheus-graphql-client ==0.27.1 + - morpheus-graphql-code-gen ==0.27.1 + - morpheus-graphql-code-gen-utils ==0.27.1 + - morpheus-graphql-core ==0.27.1 + - morpheus-graphql-server ==0.27.1 + - morpheus-graphql-subscriptions ==0.27.1 + - morpheus-graphql-tests ==0.27.1 - moss ==0.2.0.1 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 @@ -1939,7 +1939,7 @@ default-package-overrides: - polysemy-fs ==0.1.0.0 - polysemy-kvstore ==0.1.3.0 - polysemy-methodology ==0.2.2.0 - - polysemy-plugin ==0.4.4.0 + - polysemy-plugin ==0.4.5.0 - polysemy-several ==0.1.1.0 - polysemy-webserver ==0.2.1.1 - polysemy-zoo ==0.8.1.0 @@ -2105,7 +2105,7 @@ default-package-overrides: - reducers ==3.12.4 - refact ==0.3.0.2 - ref-fd ==0.5.0.1 - - refined ==0.8 + - refined ==0.8.1 - reflection ==2.1.7 - reform ==0.2.7.5 - reform-blaze ==0.2.4.4 @@ -2203,7 +2203,7 @@ default-package-overrides: - sample-frame-np ==0.0.5 - sampling ==0.3.5 - sandi ==0.5 - - sandwich ==0.1.3.0 + - sandwich ==0.1.3.1 - sandwich-hedgehog ==0.1.1.0 - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.1.0 @@ -2413,7 +2413,7 @@ default-package-overrides: - StateVar ==1.2.2 - stateWriter ==0.3.0 - static-text ==0.2.0.7 - - statistics ==0.16.1.2 + - statistics ==0.16.2.0 - status-notifier-item ==0.3.1.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2.0.1 @@ -2442,7 +2442,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.4 - streaming-cassava ==0.2.0.0 - - streaming-commons ==0.2.2.5 + - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.8.1.1 - streams ==3.3.2 @@ -2708,7 +2708,7 @@ default-package-overrides: - typed-process ==0.2.11.0 - typed-uuid ==0.2.0.0 - type-equality ==1 - - type-errors ==0.2.0.1 + - type-errors ==0.2.0.2 - type-fun ==0.1.3 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2879,7 +2879,7 @@ default-package-overrides: - wave ==0.2.0 - wcwidth ==0.0.2 - webby ==1.1.0 - - webdriver ==0.10.0.0 + - webdriver ==0.10.0.1 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - webgear-core ==1.0.4 @@ -2905,7 +2905,7 @@ default-package-overrides: - witherable ==0.4.2 - within ==0.2.0.1 - with-location ==0.1.0 - - with-utf8 ==1.0.2.3 + - with-utf8 ==1.0.2.4 - witness ==0.6.1 - wizards ==1.0.3 - wl-pprint ==1.2.1 @@ -2973,7 +2973,7 @@ default-package-overrides: - yesod-auth ==1.6.11.1 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.0.3 + - yesod-auth-oauth2 ==0.7.1.0 - yesod-bin ==1.6.2.2 - yesod-core ==1.6.24.2 - yesod-eventsource ==1.6.0.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 542ca1670d61a..cbac47ecbce68 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -810,11 +810,8 @@ dont-distribute-packages: - bitcoin-api - bitcoin-api-extra - bitcoin-block - - bitcoin-compact-filters - bitcoin-tx - bitcoin-types - - bitcoind-regtest - - bitcoind-rpc - bitfield - bitly-cli - bitmaps @@ -1112,6 +1109,7 @@ dont-distribute-packages: - cqrs-test - cqrs-testkit - crackNum + - crackNum_3_4 - craft - craftwerk-cairo - craftwerk-gtk @@ -1279,6 +1277,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora + - dl-fedora_0_9_5 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1544,9 +1543,6 @@ dont-distribute-packages: - ftshell - funbot - funbot-git-hook - - funcons-lambda-cbv-mp - - funcons-simple - - funcons-tools - function-combine - functor - functor-combo @@ -1600,7 +1596,6 @@ dont-distribute-packages: - geolite-csv - getemx - gf - - ghc-debug-brick - ghc-imported-from - ghc-instances - ghc-mod diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c9f59d265449e..bf5fe55584cec 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1083,11 +1083,11 @@ self: super: builtins.intersectAttrs super { }) super.fourmolu; # Test suite wants to run main executable - fourmolu_0_10_0_0 = overrideCabal (drv: { + fourmolu_0_10_1_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_10_0_0; + }) super.fourmolu_0_10_1_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 704e1344e1ad5..51c2130fc009a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24228,40 +24228,6 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.16.1.1"; - sha256 = "05hcbk5dhwygc29b1jbyh2zzjrxybm44hj02wmv2bhz04b5wldca"; - revision = "3"; - editedCabalFile = "0ky6fsq5z9kd8wfri7fh7jzpf3d7l6r9574zpb4sc1wwvq0p45rr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring cereal containers directory filelock filepath - mtl network network-bsd safecopy stm template-haskell - th-expand-syns unix - ]; - executableHaskellDepends = [ base directory ]; - testHaskellDepends = [ - base cereal containers deepseq directory hedgehog hspec - hspec-discover mtl network safecopy template-haskell text time - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion directory mtl random system-fileio system-filepath - ]; - description = "Add ACID guarantees to any serializable Haskell data structure"; - license = lib.licenses.publicDomain; - mainProgram = "acid-state-repair"; - }) {}; - - "acid-state_0_16_1_2" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , criterion, deepseq, directory, filelock, filepath, hedgehog - , hspec, hspec-discover, mtl, network, network-bsd, random - , safecopy, stm, system-fileio, system-filepath, template-haskell - , text, th-expand-syns, time, unix - }: - mkDerivation { - pname = "acid-state"; version = "0.16.1.2"; sha256 = "1ixg62liif1g18ggxap8zdhzy261fj5d24pmb0n36gfhz18b38bx"; isLibrary = true; @@ -24282,7 +24248,6 @@ self: { ]; description = "Add ACID guarantees to any serializable Haskell data structure"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; mainProgram = "acid-state-repair"; }) {}; @@ -27607,8 +27572,8 @@ self: { }: mkDerivation { pname = "alex"; - version = "3.2.7.1"; - sha256 = "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv"; + version = "3.2.7.2"; + sha256 = "04yfq9inq6waw1imkj3xqfg2riijzzwlnphbll7r9gjvraw8gpmy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -27620,13 +27585,13 @@ self: { mainProgram = "alex"; }) {}; - "alex_3_2_7_2" = callPackage + "alex_3_2_7_3" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { pname = "alex"; - version = "3.2.7.2"; - sha256 = "04yfq9inq6waw1imkj3xqfg2riijzzwlnphbll7r9gjvraw8gpmy"; + version = "3.2.7.3"; + sha256 = "0jdsyd6k0h2c952gqgqksh5g40gdb0lrrlpivimfxkpd14mv6rh6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -37134,8 +37099,8 @@ self: { }: mkDerivation { pname = "atomic-counter"; - version = "0.1"; - sha256 = "1vrggycr9jbnrx2gz71rfqrldmf6417kx5sp2w5g238iv6a3m9p1"; + version = "0.1.1"; + sha256 = "0gsyycj5lvq2gvq4a13kn99cx7mrv6hfv4p5n9zv3as4wbk2djpa"; libraryHaskellDepends = [ async base QuickCheck ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ @@ -45843,18 +45808,16 @@ self: { }) {}; "bitcoin-compact-filters" = callPackage - ({ mkDerivation, aeson, base, bitstream, bytestring, cereal - , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text - , transformers + ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core + , memory, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "bitcoin-compact-filters"; - version = "0.1.0.2"; - sha256 = "1cay53gbm9r5wrpk0sjq086n08lns20xsqb27hgw6a2hfcj7zai2"; + version = "0.1.1"; + sha256 = "13fpli3zbvm8ia76yb90c0mz5zkiq47frqijqwi7kdqbzx198ps9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bitstream bytestring cereal haskoin-core memory text - transformers + base bytestring cereal haskoin-core memory text transformers ]; testHaskellDepends = [ aeson base bytestring cereal haskoin-core tasty tasty-hunit @@ -45862,7 +45825,6 @@ self: { ]; description = "BIP 158 compact block filters"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitcoin-hash" = callPackage @@ -46098,7 +46060,6 @@ self: { ]; description = "A library for working with bitcoin-core regtest networks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bitcoind-rpc-explorer"; }) {}; @@ -46121,7 +46082,6 @@ self: { ]; description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitfield" = callPackage @@ -49413,24 +49373,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_6" = callPackage + "brick_1_7" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, exceptions - , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck - , stm, template-haskell, text, text-zipper, unix, vector, vty - , word-wrap + , data-clist, deepseq, directory, exceptions, filepath, microlens + , microlens-mtl, microlens-th, mtl, QuickCheck, stm + , template-haskell, text, text-zipper, unix, vector, vty, word-wrap }: mkDerivation { pname = "brick"; - version = "1.6"; - sha256 = "18vx2p8yfraxb77cd9pvdvsqgm3pcvrkc6wa74jsr7177akgnga6"; + version = "1.7"; + sha256 = "0sbsf0an7bx2ngm53c2b3dm8rlr5ydh75kf2s5bi62n6k7m9398b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap bytestring config-ini containers contravariant - data-clist deepseq directory exceptions filepath microlens - microlens-mtl microlens-th mtl stm template-haskell text - text-zipper unix vector vty word-wrap + 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 ]; testHaskellDepends = [ base containers microlens QuickCheck vector vty @@ -49500,8 +49458,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.0"; - sha256 = "1k1ms2jrf9s4h9v5s1wbw1v0d55giy93mw77x5xsfscm9aqbyd9b"; + version = "0.1.1.2"; + sha256 = "1qi7p9qj8v7k5sacvdkfr2f4mjaazg6yc6v17bxfxg3h3cswb2az"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -49813,8 +49771,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.2"; sha256 = "1zsrafz3q9l8np8wafmrbi8ilwwsgnzkc8jfjkjfgs4kq65yglqw"; - revision = "1"; - editedCabalFile = "1989dc49db8cf3ca24x4hs3nirm74xl9p0dqf8kpj1dr64y6dvzj"; + revision = "2"; + editedCabalFile = "06hyysplac9n76kpvqayc281ma8is578aqcspss0v8qkm0abylpj"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -49829,8 +49787,8 @@ self: { pname = "broadcast-chan-conduit"; version = "0.2.1.2"; sha256 = "0mwd82arm50zwz559qzxi70ia9d4h5kjwdvhk09jf966hd0knnmm"; - revision = "1"; - editedCabalFile = "0p0xp5jd5mjgapym482178z2b0vs61w93dxza37n3gqgd28n79is"; + revision = "2"; + editedCabalFile = "1k7lgfpxh7vyyv68m8bznl1b3nnr10xx7ky01r2x5b75f96asll4"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -49850,8 +49808,8 @@ self: { pname = "broadcast-chan-pipes"; version = "0.2.1.1"; sha256 = "06nghcddlcnc97p3464fsgcfvjlsnxv7i7khzws3g3myl8hrd89c"; - revision = "1"; - editedCabalFile = "1cigswvq3jvsvk155mszyvjvrhlng7yjf8gnvdw2hw089dzsva95"; + revision = "2"; + editedCabalFile = "0vzfjjhy4k07aizg1q3a1r99cacnihkjsxakllygrkl9hsya2cp0"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -49871,8 +49829,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.1.2"; sha256 = "08qjvhdx2pwgj5kcl5fmg5qdlzbdchxjihmqch4sgv48kcga06nv"; - revision = "3"; - editedCabalFile = "0z8ldbdgwzacl6pimn8784yvqnl6na8ffzbh76icdic59frwc2sz"; + revision = "4"; + editedCabalFile = "1y1qxb9ibplx1hpwxwa83szxjwa6ridji25w0gmx92yrz11rprlj"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -55104,8 +55062,8 @@ self: { }: mkDerivation { pname = "canadian-income-tax"; - version = "2022.2.0.1"; - sha256 = "0vf820sx1jy0zba1nba3j8cz9rkzbjm44kwd18qkidqvf3xr7fg4"; + version = "2022.2.1"; + sha256 = "0h8ivn9cwhfxbhk9jazx1vlbr80l6fx9bawvgh34wj07y3xflrqp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57052,8 +57010,8 @@ self: { pname = "cborg"; version = "0.2.8.0"; sha256 = "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f"; - revision = "2"; - editedCabalFile = "0pvnzanysxiikq3kghhax9v2m693s23v9pas03iaggw0h098yns4"; + revision = "3"; + editedCabalFile = "0a6lgb9qjxp9l2bkdzs048b672dcvaa4ifvxcdj5c9whfdhfl04d"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -64803,10 +64761,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "commutative-semigroups"; - version = "0.1.0.0"; - sha256 = "06063ayahakj0wdwwzqwbb61cxjrrkpayzmvbvf7pcdsgyn427b6"; - revision = "3"; - editedCabalFile = "1g3z3w70hgcbkpf298pnafslx4f2pv9gs6vbgyx215y2p8amvn6s"; + version = "0.1.0.1"; + sha256 = "1bmafx363gfsd9wwrf3xyrw9mnw6anmc1zdfv0p8597y4lxxach7"; libraryHaskellDepends = [ base containers ]; description = "Commutative semigroups"; license = lib.licenses.bsd3; @@ -67646,6 +67602,8 @@ self: { pname = "config-ini"; version = "0.2.5.0"; sha256 = "07vgpydzd44ayhq9c3q1335vphw384z8baf0wd0mnarr48yfaz3g"; + revision = "1"; + editedCabalFile = "1allnxx4dsani79nwq1iyzn6cvqz5cjif7g72kb8r0khfzrqxp5l"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -69922,23 +69880,6 @@ self: { }: mkDerivation { pname = "core-data"; - version = "0.3.9.0"; - sha256 = "126z21i4f7z7pf415jjqjd4ik6sb9kid1dgrlc2yzq2vd4wdi9gg"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable hourglass - prettyprinter scientific text time unordered-containers uuid vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = lib.licenses.mit; - }) {}; - - "core-data_0_3_9_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, hourglass, prettyprinter, scientific, text, time - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "core-data"; version = "0.3.9.1"; sha256 = "16gw12b0dlb6vji0b6lyiydax4nd2h41hbjr7qvlcyiwz3zc5ji4"; libraryHaskellDepends = [ @@ -69947,7 +69888,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-effect-effectful" = callPackage @@ -69992,27 +69932,6 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.6.5.0"; - sha256 = "0xbvwivby27dky11nhs0szs9dbs5mlivspbkvrflja30kaa7lqam"; - libraryHaskellDepends = [ - base bytestring core-data core-text directory exceptions filepath - fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm - template-haskell terminal-size text text-short transformers - typed-process unix unliftio-core - ]; - description = "Opinionated Haskell Interoperability"; - license = lib.licenses.mit; - }) {}; - - "core-program_0_6_5_1" = callPackage - ({ mkDerivation, base, bytestring, core-data, core-text, directory - , exceptions, filepath, fsnotify, hashable, hourglass, mtl - , prettyprinter, safe-exceptions, stm, template-haskell - , terminal-size, text, text-short, transformers, typed-process - , unix, unliftio-core - }: - mkDerivation { - pname = "core-program"; version = "0.6.5.1"; sha256 = "08znxjkr3mkkcj9chgps158a5i1szclan2nsji4lq4c7q9678f21"; libraryHaskellDepends = [ @@ -70023,7 +69942,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -71136,6 +71054,25 @@ self: { mainProgram = "crackNum"; }) {}; + "crackNum_3_4" = callPackage + ({ mkDerivation, base, directory, filepath, libBF, process, sbv + , tasty, tasty-golden + }: + mkDerivation { + pname = "crackNum"; + version = "3.4"; + sha256 = "11svazilhckz1qcqf9gnjnsnwb6yywzr9zmz4875n9khrwwp654c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath libBF process sbv tasty tasty-golden + ]; + description = "Crack various integer and floating-point data formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "crackNum"; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -75996,10 +75933,8 @@ self: { ({ mkDerivation, base, containers, data-elevator, deepseq, HUnit }: mkDerivation { pname = "data-forced"; - version = "0.1.0.0"; - sha256 = "0njxf6g2lrpbh8vvc3iga7q216nfvxvf23vn9rbl6c7g0kj22112"; - revision = "1"; - editedCabalFile = "0fhgp6d9ipncmxqymz4isy2id98da1lcvbkpy828mm5dqchnwchf"; + version = "0.2.0.0"; + sha256 = "0wg2l1ad05yhymi37wbb6sq9jab6cl69mkghp7qigviyzfcdw66y"; libraryHaskellDepends = [ base data-elevator deepseq ]; testHaskellDepends = [ base containers HUnit ]; description = "Specify that lifted values were forced to WHNF or NF"; @@ -77709,33 +77644,6 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.27"; - sha256 = "0lkk9hd78h2ilvi0bj5jqq5q5lwyxzdlknwvckhwyxnlf3y6dz8z"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = lib.licenses.asl20; - }) {}; - - "dbus_1_2_28" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; version = "1.2.28"; sha256 = "0j2acn3i85v22vdf1kcjnwx2bagghdv5lil8h4i5v5wnydlaf4vw"; libraryHaskellDepends = [ @@ -77752,7 +77660,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -81762,10 +81669,8 @@ self: { }: mkDerivation { pname = "diagrams-html5"; - version = "1.4.1"; - sha256 = "0vp99ks9ldy91x1jlla0kyg8sq9748k82ql0jsf0jxhimvwd7vp8"; - revision = "1"; - editedCabalFile = "1liyymlgaqnasc9ar70acg47mgyl10vcily54hjbxlna7yjh4jy8"; + version = "1.4.2"; + sha256 = "115ch8642cl84mwpj2c23g94fbrrg256s6y1qhsh80qjaq42y1yl"; libraryHaskellDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split @@ -84917,6 +84822,30 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_0_9_5" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , http-client, http-client-tls, http-directory, http-types + , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args + , text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.9.5"; + sha256 = "105vy7bnwbvp6pv8p1lk96qp1asck5wk3677l56snxyqds5qfx0i"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -95002,6 +94931,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventlog-socket" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "eventlog-socket"; + version = "0.1.0.0"; + sha256 = "0rlwasd1hamyhpn4h3kk3s5sfhxvc1j8sz4nkxnmch6xgcqcp4yl"; + libraryHaskellDepends = [ base ]; + description = "Stream GHC eventlog events to external processes"; + license = lib.licenses.bsd3; + }) {}; + "eventlog2html" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , bytestring, containers, file-embed, filepath, ghc-events @@ -98695,8 +98635,8 @@ self: { }: mkDerivation { pname = "fcf-containers"; - version = "0.8.1"; - sha256 = "1jrr4hs9cv3226n7gflvmmj26xvq148ma4y2wxjgv8zhkrprys53"; + version = "0.8.2"; + sha256 = "0d8aylgfnfkxj227g553n0za3zlv7sbm9l44l34k53hxg41k0as1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100276,27 +100216,12 @@ self: { ({ mkDerivation, async, base, process, unix }: mkDerivation { pname = "filelock"; - version = "0.1.1.5"; - sha256 = "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh"; - revision = "1"; - editedCabalFile = "0bda8lda5mb1lfga56gid3dm1rb49jiwwhri7b1aml6906q6lnrx"; - libraryHaskellDepends = [ base unix ]; - testHaskellDepends = [ async base process ]; - description = "Portable interface to file locking (flock / LockFileEx)"; - license = lib.licenses.publicDomain; - }) {}; - - "filelock_0_1_1_6" = callPackage - ({ mkDerivation, async, base, process, unix }: - mkDerivation { - pname = "filelock"; version = "0.1.1.6"; sha256 = "122v6nv13rgi7nprdcpz8zc534i85yz6lshx0jx5mfqjam4zcx5g"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ async base process ]; description = "Portable interface to file locking (flock / LockFileEx)"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "filemanip" = callPackage @@ -104507,7 +104432,7 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_10_0_0" = callPackage + "fourmolu_0_10_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal-syntax, containers, Diff, directory, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover @@ -104517,8 +104442,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.10.0.0"; - sha256 = "05ypz963xpz00fa6g1a8vpm4v2qy52jmcb4js6g8xi8m8r9fdica"; + version = "0.10.1.0"; + sha256 = "0gkzd2wf8hji5j0pxjv7l43m405zwsvppj7hax69j86346mb8hp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106714,7 +106639,6 @@ self: { ]; description = "call-by-value lambda-calculus with meta-programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "lambda-cbv"; }) {}; @@ -106731,36 +106655,32 @@ self: { executableHaskellDepends = [ base funcons-tools funcons-values ]; description = "A modular interpreter for executing SIMPLE funcons"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "runfct-SIMPLE"; }) {}; "funcons-tools" = callPackage ({ mkDerivation, base, bv, containers, directory , exploring-interpreters, funcons-values, gll, haskeline, mtl - , multiset, random-strings, regex-applicative, split, text - , transformers, TypeCompose, vector + , multiset, random, regex-applicative, split, text, transformers + , vector }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.13"; - sha256 = "0favv5lfhhhsjasn0gfx2m9q18j8qjk3w92ih78nqaam8gfg59vm"; + version = "0.2.0.15"; + sha256 = "0yfl7rg7hwy8yyxq5axicd57lk650i5pmm0slnxqbsgl96iv8x24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bv containers directory funcons-values gll haskeline mtl - multiset random-strings regex-applicative split text TypeCompose - vector + multiset random regex-applicative split text vector ]; executableHaskellDepends = [ base bv containers directory exploring-interpreters funcons-values - gll haskeline mtl multiset random-strings regex-applicative split - text transformers TypeCompose vector + gll haskeline mtl multiset random regex-applicative split text + transformers vector ]; description = "A modular interpreter for executing funcons"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "funcons-repl"; }) {}; "funcons-values" = callPackage @@ -107400,8 +107320,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.24.1"; - sha256 = "1j459dhh2670p985rsbqjc37vhw87dymk8hy9fhx6gf0yvxkmg08"; + version = "0.24.2"; + sha256 = "1dkjd66x6x9wvbdq9kr0mfkasndnnnchcqxhd2c4ffwncwvk346q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109358,6 +109278,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-lens_2_2_2_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, lens, profunctors, text + }: + mkDerivation { + pname = "generic-lens"; + version = "2.2.2.0"; + sha256 = "0s4b51s11ssmndmx9m9zbwgv9rb27ajwihsrk10hn582rp4ck3c6"; + libraryHaskellDepends = [ + base generic-lens-core profunctors text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-lens-core" = callPackage ({ mkDerivation, base, indexed-profunctors, text }: mkDerivation { @@ -111507,7 +111446,6 @@ self: { ]; description = "A simple TUI using ghc-debug"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ghc-debug-brick"; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -122888,22 +122826,22 @@ self: { "grisette" = callPackage ({ mkDerivation, array, base, bytestring, call-stack, deepseq , doctest, generic-deriving, Glob, hashable, hashtables, intern - , loch-th, mtl, once, sbv, tasty, tasty-hunit, tasty-quickcheck - , tasty-test-reporter, template-haskell, th-compat, transformers - , unordered-containers, vector + , loch-th, mtl, once, parallel, sbv, tasty, tasty-hunit + , tasty-quickcheck, tasty-test-reporter, template-haskell + , th-compat, transformers, unordered-containers, vector }: mkDerivation { pname = "grisette"; - version = "0.1.0.0"; - sha256 = "1dl972402pyk6i636w1547hdpyhhaikfzfpvqp19jrwgm5fdnifi"; + version = "0.2.0.0"; + sha256 = "0l7aal879xb5zlfa78rsijiw68h6q4qkfcqp5gnwajf3lcymy8gx"; libraryHaskellDepends = [ array base bytestring call-stack deepseq generic-deriving hashable - hashtables intern loch-th mtl once sbv template-haskell th-compat - transformers unordered-containers vector + hashtables intern loch-th mtl once parallel sbv template-haskell + th-compat transformers unordered-containers vector ]; testHaskellDepends = [ array base bytestring call-stack deepseq doctest generic-deriving - Glob hashable hashtables intern loch-th mtl once sbv tasty + Glob hashable hashtables intern loch-th mtl once parallel sbv tasty tasty-hunit tasty-quickcheck tasty-test-reporter template-haskell th-compat transformers unordered-containers vector ]; @@ -134640,26 +134578,6 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.0.3"; - sha256 = "0yhl2r1wiy5sxn77mv6g8yr2mf00q8sjvq7vg84k04c4x6kl9w9n"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hasql hasql-pool postgresql-libpq text - ]; - executableHaskellDepends = [ base hasql ]; - testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; - description = "LISTEN/NOTIFY support for Hasql"; - license = lib.licenses.bsd3; - mainProgram = "hasql-notifications"; - }) {}; - - "hasql-notifications_0_2_0_4" = callPackage - ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec - , postgresql-libpq, QuickCheck, text - }: - mkDerivation { - pname = "hasql-notifications"; version = "0.2.0.4"; sha256 = "0r8vmp5pqzsc37ifsri5v3m5nmj5k1pid4yxhqqiyg7vimr5i89n"; isLibrary = true; @@ -134671,7 +134589,6 @@ self: { testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; description = "LISTEN/NOTIFY support for Hasql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hasql-notifications"; }) {}; @@ -134736,14 +134653,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_9" = callPackage + "hasql-pool_0_9_0_1" = callPackage ({ mkDerivation, async, base, hasql, hspec, random, rerebase, stm , time }: mkDerivation { pname = "hasql-pool"; - version = "0.9"; - sha256 = "1ngz4pmkj31nyv3gb0lrq15wk3ax7h3gga1df17lm2q2y9cb0gip"; + version = "0.9.0.1"; + sha256 = "00p06yjyasdcv9f7wn29c9il08drcym65k0xnh7kzyma871wv7yq"; libraryHaskellDepends = [ base hasql stm time ]; testHaskellDepends = [ async hasql hspec random rerebase ]; description = "Pool of connections for Hasql"; @@ -137681,6 +137598,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedis_0_15_2" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit + , mtl, network, network-uri, resource-pool, scanner, stm + , test-framework, test-framework-hunit, text, time, tls + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.15.2"; + sha256 = "0za6ybxzfba922jz5zzvyqd1yy7g7kcj5j3hjzpi2w2hwcbwa21p"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing containers deepseq errors + exceptions HTTP mtl network network-uri resource-pool scanner stm + text time tls unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -142313,8 +142256,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.4.2"; - sha256 = "0fyqxdz2qgkn03a4db5f5v6x56wi61bcmchcdxj4s1hgysvjzfzp"; + version = "0.5.0"; + sha256 = "1y5v27dyhq7qcqrdxsvmxfh98lswdvjvr8pw0hxf2005vi5sxdcf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148114,8 +148057,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.3.0"; - sha256 = "157971qzbxbnwg81879x9rm76slac07s72gx4l1czs6ll53pkl3d"; + version = "1.16.3.1"; + sha256 = "1wkz2klb0byfpchbfibnafib3drqpw5ax59hl9k45da8dpg5dprl"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -162868,29 +162811,6 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.5.0.4"; - sha256 = "1gk3qxn8hg15h6aw7aswjr302pda2m20irzmbc6av2hw254d8b9p"; - libraryHaskellDepends = [ - base input-parsers monoid-subclasses parsers rank2classes - transformers - ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = lib.licenses.gpl3Only; - }) {}; - - "incremental-parser_0_5_0_5" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , input-parsers, monoid-subclasses, parsers, QuickCheck - , rank2classes, tasty, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "incremental-parser"; version = "0.5.0.5"; sha256 = "1hxw7an7ysdhjn2alkv4li3wc9wf56aff1jnkkkvfivjhv0i482c"; libraryHaskellDepends = [ @@ -162905,7 +162825,6 @@ self: { ]; description = "Generic parser library capable of providing partial results from partial input"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -164535,6 +164454,8 @@ self: { pname = "integer-roots"; version = "1.0.2.0"; sha256 = "15sn3jgm8axm8f9z02aj3xdf318qwwc5qfc8b4r0n7hfr1jgrqs5"; + revision = "1"; + editedCabalFile = "1ff3w9ygyw5shshknyrcl4j7g3gbaz3dyfm8a6gwndrkg1nb7a37"; libraryHaskellDepends = [ base ghc-bignum ]; testHaskellDepends = [ base doctest smallcheck tasty tasty-hunit tasty-quickcheck @@ -173326,27 +173247,12 @@ self: { ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.0.2"; - sha256 = "1sxzgh8g9fahqwx7ky4f1g03fhy791hilfansx8kf39gfk646dcw"; - revision = "1"; - editedCabalFile = "1p11i2dsy0vhdj57510jn554fm7a0dwprjhh37p02dqxvggwa505"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base stm tasty tasty-hunit ]; - description = "A lightweight structured concurrency library"; - license = lib.licenses.bsd3; - }) {}; - - "ki_1_0_1_0" = callPackage - ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: - mkDerivation { - pname = "ki"; version = "1.0.1.0"; sha256 = "0jwm1f26c89715vm8z5mwr8dzrgj7vjp4b0drhrivzcp381v28jb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ki-effectful" = callPackage @@ -177216,6 +177122,8 @@ self: { pname = "lapack"; version = "0.5.0.2"; sha256 = "18gb8p2mx9hwhcqnqghvjhrdbxr7sziyr936vn2bnh33w9srnghi"; + revision = "1"; + editedCabalFile = "0z2lp9x1difxi5pddjgmn3dxkw6wp6qjhl0w8d5i6qgzg4r50kl3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180670,8 +180578,8 @@ self: { }: mkDerivation { pname = "libphonenumber"; - version = "0.1.1.0"; - sha256 = "02d7bin6q26y427fa6xbr48a6ibcjpjbrwd11pky0qjc71i64yhp"; + version = "0.1.2.0"; + sha256 = "0iw4ps3dky0grbvmajaz81d6q9zzqy8r9jfjmh6bc5i6k3w0mqwa"; libraryHaskellDepends = [ base bytestring containers deepseq transformers ]; @@ -181673,8 +181581,8 @@ self: { }: mkDerivation { pname = "lima"; - version = "0.2.1.1"; - sha256 = "1q8xjgsnpfcxarz08m6kl10mjg3ik7qyrvdvgz34xwd6s90x2x3l"; + version = "0.2.1.2"; + sha256 = "1x937qrxzzi0g6fdk36mbxlrb0zf5m38s6in6g1p15nzr88p50dx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186832,31 +186740,6 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.11.1"; - sha256 = "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw"; - revision = "1"; - editedCabalFile = "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text transformers - ]; - description = "Clear to write, read and edit DSL for HTML"; - license = lib.licenses.bsd3; - }) {}; - - "lucid_2_11_20230408" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers - }: - mkDerivation { - pname = "lucid"; version = "2.11.20230408"; sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"; libraryHaskellDepends = [ @@ -186871,7 +186754,6 @@ self: { ]; description = "Clear to write, read and edit DSL for HTML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lucid-alpine" = callPackage @@ -190001,6 +189883,8 @@ self: { pname = "massiv"; version = "1.0.3.0"; sha256 = "1q0qp4xz7z3r70581lry9bkldjv195wfagazwbq6lkxrf8i25lx1"; + revision = "1"; + editedCabalFile = "1jrbn37lpmipi11ab4n4wdnp36349kwi7gqb5s5s5qigq8207gk9"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler unliftio-core vector vector-stream @@ -193532,23 +193416,6 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.11"; - sha256 = "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens tagged ]; - description = "Automatic generation of record lenses for microlens"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_12" = callPackage - ({ mkDerivation, base, containers, microlens, tagged - , template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; version = "0.4.3.12"; sha256 = "0kssb0j9x7cj4y10bspnkfrwyadjq20np12al4qxbbiwpvk6za0a"; libraryHaskellDepends = [ @@ -193558,7 +193425,6 @@ self: { testHaskellDepends = [ base microlens tagged ]; description = "Automatic generation of record lenses for microlens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "micrologger" = callPackage @@ -198525,8 +198391,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.2.1.1"; - sha256 = "0b5xr7pzppv3lds28l5gzh56lw4s6v7qlx624ma076vg61rxxkl2"; + version = "0.3.0.0"; + sha256 = "0xjkk4fqkx65f9jsh8bw1z2pnbdwxx3f64x2pznajgfkxd8a2svl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199042,36 +198908,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.0"; - sha256 = "1d2wk0zw3qb22skv7g4xagl04las5xnh9f4223c4as9cf39pcrp9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server mtl relude template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server morpheus-graphql-subscriptions - morpheus-graphql-tests mtl relude tasty tasty-hunit - template-haskell text transformers unordered-containers vector - ]; - description = "Morpheus GraphQL"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , morpheus-graphql-app, morpheus-graphql-code-gen - , morpheus-graphql-core, morpheus-graphql-server - , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl - , relude, tasty, tasty-hunit, template-haskell, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "morpheus-graphql"; version = "0.27.1"; sha256 = "1n9qflbgl7f4qd3sxc6rwnv0rmg0dj731rf1b9avc6xw199ydr3w"; enableSeparateDataOutput = true; @@ -199090,7 +198926,6 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-app" = callPackage @@ -199102,33 +198937,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.27.0"; - sha256 = "0mg12a8s2zcxcbm1zm5a4gn6vz8d9d1qdhk930zddxqbll5gq7nq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers hashable megaparsec - morpheus-graphql-core mtl relude scientific template-haskell text - th-lift-instances transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers directory hashable megaparsec - morpheus-graphql-core morpheus-graphql-tests mtl relude scientific - tasty tasty-hunit template-haskell text th-lift-instances - transformers unordered-containers vector - ]; - description = "Morpheus GraphQL App"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-app_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , hashable, megaparsec, morpheus-graphql-core - , morpheus-graphql-tests, mtl, relude, scientific, tasty - , tasty-hunit, template-haskell, text, th-lift-instances - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "morpheus-graphql-app"; version = "0.27.1"; sha256 = "0qs5gx7k1ix4i0mqkmy681xlg7ckr8fy089rj4c25vgv8rm0p36w"; enableSeparateDataOutput = true; @@ -199145,7 +198953,6 @@ self: { ]; description = "Morpheus GraphQL App"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-cli" = callPackage @@ -199181,37 +198988,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.27.0"; - sha256 = "120414v0rcvzgm9dc2fx8598d88dqnpvhkc8zh3y2gl3b1bl31jb"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers file-embed modern-uri - morpheus-graphql-code-gen-utils morpheus-graphql-core - morpheus-graphql-subscriptions mtl prettyprinter relude req - template-haskell text transformers unliftio-core - unordered-containers websockets wuss - ]; - testHaskellDepends = [ - aeson base bytestring containers directory file-embed modern-uri - morpheus-graphql-code-gen-utils morpheus-graphql-core - morpheus-graphql-subscriptions mtl prettyprinter relude req tasty - tasty-hunit template-haskell text transformers unliftio-core - unordered-containers websockets wuss - ]; - description = "Morpheus GraphQL Client"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-client_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , file-embed, modern-uri, morpheus-graphql-code-gen-utils - , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl - , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell - , text, transformers, unliftio-core, unordered-containers - , websockets, wuss - }: - mkDerivation { - pname = "morpheus-graphql-client"; version = "0.27.1"; sha256 = "095kyjyv7gyrlqsdbw1aab2l990risr72c2j5gcwskbgqm7p3fip"; enableSeparateDataOutput = true; @@ -199231,7 +199007,6 @@ self: { ]; description = "Morpheus GraphQL Client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-code-gen" = callPackage @@ -199243,37 +199018,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.0"; - sha256 = "0aw9fl0hzl657w2arybyk0zqxvbdz897kiqwsv52r50dnb5x2izf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers file-embed - morpheus-graphql-code-gen-utils morpheus-graphql-core - morpheus-graphql-server prettyprinter relude template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - base bytestring containers file-embed filepath Glob - morpheus-graphql-client morpheus-graphql-code-gen-utils - morpheus-graphql-core morpheus-graphql-server optparse-applicative - prettyprinter relude template-haskell text unordered-containers - yaml - ]; - description = "Morpheus GraphQL CLI"; - license = lib.licenses.bsd3; - mainProgram = "morpheus"; - }) {}; - - "morpheus-graphql-code-gen_0_27_1" = callPackage - ({ mkDerivation, base, bytestring, containers, file-embed, filepath - , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils - , morpheus-graphql-core, morpheus-graphql-server - , optparse-applicative, prettyprinter, relude, template-haskell - , text, unordered-containers, yaml - }: - mkDerivation { - pname = "morpheus-graphql-code-gen"; version = "0.27.1"; sha256 = "0qvk2zpqhhjjfha5hfd9nkv30m07qbbnpil9h00w3skdw33mqqqk"; isLibrary = true; @@ -199293,7 +199037,6 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "morpheus"; }) {}; @@ -199304,23 +199047,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.27.0"; - sha256 = "1d5v3b63v9yf47a5hh2am6v09hwm4sfxls38iwvlxva3km0s1qgn"; - libraryHaskellDepends = [ - base bytestring containers morpheus-graphql-core mtl prettyprinter - relude template-haskell text unordered-containers - ]; - description = "Morpheus GraphQL CLI"; - license = lib.licenses.bsd3; - }) {}; - - "morpheus-graphql-code-gen-utils_0_27_1" = callPackage - ({ mkDerivation, base, bytestring, containers - , morpheus-graphql-core, mtl, prettyprinter, relude - , template-haskell, text, unordered-containers - }: - mkDerivation { - pname = "morpheus-graphql-code-gen-utils"; version = "0.27.1"; sha256 = "0f8152jzjynfl65k8f4iyyi8akqrcn9dhx8pi20yhf152h5w0clp"; libraryHaskellDepends = [ @@ -199329,7 +199055,6 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-core" = callPackage @@ -199340,32 +199065,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.27.0"; - sha256 = "0001pq7zj5rpjcg0jasd3vklisan2i8nxyk8d7xa31d4f1grn5ff"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers hashable megaparsec mtl relude - scientific template-haskell text th-lift-instances transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers directory hashable megaparsec - morpheus-graphql-tests mtl relude scientific tasty tasty-hunit - template-haskell text th-lift-instances transformers - unordered-containers vector - ]; - description = "Morpheus GraphQL Core"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-core_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , hashable, megaparsec, morpheus-graphql-tests, mtl, relude - , scientific, tasty, tasty-hunit, template-haskell, text - , th-lift-instances, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "morpheus-graphql-core"; version = "0.27.1"; sha256 = "1id4dxi4kpgd25ffhw5qgkl05b2642qpz5dss68nq0n1cs2c021b"; enableSeparateDataOutput = true; @@ -199382,7 +199081,6 @@ self: { ]; description = "Morpheus GraphQL Core"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-server" = callPackage @@ -199394,33 +199092,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.27.0"; - sha256 = "0cd6qczbb5cm12xv181pzq6d62nv7nf4w1yd3gmhzjfrks62lhwy"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-core mtl relude template-haskell text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed morpheus-graphql-app - morpheus-graphql-core morpheus-graphql-subscriptions - morpheus-graphql-tests mtl relude tasty tasty-hunit - template-haskell text transformers unordered-containers vector - ]; - description = "Morpheus GraphQL"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-server_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , morpheus-graphql-app, morpheus-graphql-core - , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl - , relude, tasty, tasty-hunit, template-haskell, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "morpheus-graphql-server"; version = "0.27.1"; sha256 = "0b8hipwp5ddxn92appn2n6s43kmqvqrp2rg055jkb2kcfwh8g828"; enableSeparateDataOutput = true; @@ -199437,7 +199108,6 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-subscriptions" = callPackage @@ -199447,24 +199117,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.27.0"; - sha256 = "138fcganlaj4fyq1aygiyy6f4hhw58n26ldrdkxhd66hr1mqv6j9"; - libraryHaskellDepends = [ - aeson base bytestring morpheus-graphql-app morpheus-graphql-core - mtl relude text transformers unliftio-core unordered-containers - uuid websockets - ]; - description = "Morpheus GraphQL Subscriptions"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-subscriptions_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app - , morpheus-graphql-core, mtl, relude, text, transformers - , unliftio-core, unordered-containers, uuid, websockets - }: - mkDerivation { - pname = "morpheus-graphql-subscriptions"; version = "0.27.1"; sha256 = "0nj05ywj460v8kd821w7br44bx8wzqbbil0jb42sv442py69d6lj"; libraryHaskellDepends = [ @@ -199474,7 +199126,6 @@ self: { ]; description = "Morpheus GraphQL Subscriptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-tests" = callPackage @@ -199483,22 +199134,6 @@ self: { }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.27.0"; - sha256 = "1h6nri73s5ibzidhwrkxffldardx6khq9kvhmqklm06cilwr56xi"; - libraryHaskellDepends = [ - aeson base bytestring directory relude tasty tasty-hunit text - unordered-containers - ]; - description = "Morpheus GraphQL Test"; - license = lib.licenses.mit; - }) {}; - - "morpheus-graphql-tests_0_27_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty - , tasty-hunit, text, unordered-containers - }: - mkDerivation { - pname = "morpheus-graphql-tests"; version = "0.27.1"; sha256 = "1nhpcai8lk3jq676zp6y6jcylm3zjzl4s6hk0f3g7vmg971ycd9w"; libraryHaskellDepends = [ @@ -199507,7 +199142,6 @@ self: { ]; description = "Morpheus GraphQL Test"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morphisms" = callPackage @@ -212390,6 +212024,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_9_6_2" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.9.6.2"; + sha256 = "1pq0n3n686bbh6abjagxjkx4whkj1mw7nqvh1f4bkp9f3l4h7a3v"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -219159,6 +218823,8 @@ self: { pname = "parsley-core"; version = "2.2.0.0"; sha256 = "0xkrlplvi97im634v2877capdnp9bl3ynqcxvr707j1s3z3636nq"; + revision = "1"; + editedCabalFile = "08y0px0178wmm6vj8y3gssh291j40mi9il18ifl8fxpb58488imq"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal rangeset template-haskell @@ -223409,8 +223075,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.2.3.0"; - sha256 = "07bnq7kg37wlirfkgiyskpkzh7vkp3n2ilxkbj7mnl042ninfqi7"; + version = "0.2.4.0"; + sha256 = "04wzlgn2wkyb6j9499mcqgji5r2xw777xm3pyd35qh3gbkz7k0yj"; libraryHaskellDepends = [ base cli-arguments phladiprelio-general-shared phonetic-languages-phonetics-basics rhythmic-sequences @@ -223454,8 +223120,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.3.3.0"; - sha256 = "13wdcz0yma0088q2yqvcn7s22gbkk755rjf2cfw0b1320jx066sa"; + version = "0.3.4.0"; + sha256 = "1h6bdy7g3fgm555g7vmqzaidhlfv2zpl4an8j5j69wl3g11l5k2g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228648,30 +228314,6 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.4.4.0"; - sha256 = "1kp7d4m007mlk4pl2p8933b5yzzb8gl30g1vfbbz01vm3pgjcj3d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra polysemy syb transformers - ]; - testHaskellDepends = [ - base containers doctest ghc ghc-tcplugins-extra hspec - hspec-discover inspection-testing polysemy should-not-typecheck syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Disambiguate obvious uses of effects"; - license = lib.licenses.bsd3; - }) {}; - - "polysemy-plugin_0_4_5_0" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , ghc, ghc-tcplugins-extra, hspec, hspec-discover - , inspection-testing, polysemy, should-not-typecheck, syb - , transformers - }: - mkDerivation { - pname = "polysemy-plugin"; version = "0.4.5.0"; sha256 = "1q06276pqw1zm4x5hq0ax7ia12d32cajvhwpmx2nwqj5yh7jyygh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -228686,7 +228328,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-process" = callPackage @@ -232653,13 +232294,15 @@ self: { }) {}; "prettyprint-avh4" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-discover }: + ({ mkDerivation, base, bytestring, hspec, hspec-discover + , QuickCheck + }: mkDerivation { pname = "prettyprint-avh4"; - version = "0.1.0.0"; - sha256 = "01ghn39i0a8f1778hsvxx5r8c28raqpr997lan1k5pwyqgb6nlbr"; + version = "0.1.1.0"; + sha256 = "00g79l3b0vzcg0hrm2ywiawwfb2ndz93ra6sswmj59gx6y04q2vp"; libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring hspec ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "API for prettyprinting custom syntax trees (extracted from elm-format)"; license = lib.licenses.bsd3; @@ -234198,6 +233841,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "product-profunctors_0_11_1_1" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell, th-abstraction + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.11.1.1"; + sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + th-abstraction + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "product-profunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "prof-flamegraph" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -240796,6 +240458,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "random-cycle" = callPackage + ({ mkDerivation, algebraic-graphs, base, criterion, mwc-random + , primitive, random, tasty, tasty-hunit, tasty-quickcheck, vector + , vector-algorithms + }: + mkDerivation { + pname = "random-cycle"; + version = "0.1.0.0"; + sha256 = "1l103ab5v0vyzq48s9dqyc9mkyy3z0p0nb4n14627vqy38089vim"; + libraryHaskellDepends = [ + base mwc-random primitive random vector + ]; + testHaskellDepends = [ + algebraic-graphs base random tasty tasty-hunit tasty-quickcheck + vector vector-algorithms + ]; + benchmarkHaskellDepends = [ base criterion random vector ]; + description = "Uniform draws of partitions and cycle-partitions, with thinning"; + license = lib.licenses.gpl3Plus; + }) {}; + "random-derive" = callPackage ({ mkDerivation, base, random, template-haskell }: mkDerivation { @@ -240866,6 +240549,24 @@ self: { license = lib.licenses.publicDomain; }) {}; + "random-fu_0_3_0_1" = callPackage + ({ mkDerivation, base, erf, math-functions, monad-loops, mtl + , random, random-shuffle, rvar, syb, template-haskell, transformers + , vector + }: + mkDerivation { + pname = "random-fu"; + version = "0.3.0.1"; + sha256 = "0h2yqjvy9ap5yfcdfr1x28qximx8lr63mlwssxvg3z74g496krh6"; + libraryHaskellDepends = [ + base erf math-functions monad-loops mtl random random-shuffle rvar + syb template-haskell transformers vector + ]; + description = "Random number generation"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-fu-multivariate" = callPackage ({ mkDerivation, base, hmatrix, mtl, random-fu }: mkDerivation { @@ -240925,10 +240626,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.11"; - sha256 = "0lwqbd0h495srgi2p8fsmsfk5hv5m3f6cxm12j61xx94fdyn98sv"; - revision = "2"; - editedCabalFile = "1bxw5mrrzyhd74jclgn1b6x78rsh301ys86m2jrkcy4zsxhaqr99"; + version = "0.3.0.12"; + sha256 = "0iv8n0xar8sxw01inbvm05cy5ccmlaf0dd044zlcq0977ynaj8f9"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -241175,18 +240874,19 @@ self: { }) {}; "rangeset" = callPackage - ({ mkDerivation, array, base, containers, cpphs, deepseq, gauge - , QuickCheck, selective, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, array, base, containers, deepseq, gauge + , QuickCheck, random, random-shuffle, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "rangeset"; - version = "0.0.1.0"; - sha256 = "0pq5m8gq75v1a0rmknmb6f5yz9j5zckfpwm5czx6qqanp5minz9j"; + version = "0.1.0.0"; + sha256 = "13z83p1y5afnncqakih73jgn47kk4s71cz1h424s0fx8b9frddyh"; libraryHaskellDepends = [ base ]; - libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ - array base containers deepseq gauge QuickCheck selective + array base containers deepseq gauge QuickCheck random + random-shuffle ]; description = "Efficient sets for semi-contiguous data"; license = lib.licenses.bsd3; @@ -243424,8 +243124,8 @@ self: { pname = "recursion-schemes"; version = "5.2.2.4"; sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; - revision = "1"; - editedCabalFile = "1sb3pc1z40ss6rmiqifhcawiw1qdxc1mahcbwgfsfvpxlbmzlrrb"; + revision = "2"; + editedCabalFile = "1617jz77d4f2hf54jfz30zbf18rcgl6h0nzn3rcl0gjxjavf5aq6"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -244113,23 +243813,6 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.8"; - sha256 = "0qkzmnycg5pda259lxfy9s03cyi9knvxx9934bihh5vl9bb7sirs"; - libraryHaskellDepends = [ - aeson base bytestring deepseq exceptions hashable mtl QuickCheck - template-haskell text these-skinny - ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Refinement types with static and runtime checking"; - license = lib.licenses.mit; - }) {}; - - "refined_0_8_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , hashable, mtl, QuickCheck, template-haskell, text, these-skinny - }: - mkDerivation { - pname = "refined"; version = "0.8.1"; sha256 = "0d971w7g6qcsczv3b4i4v5mjsfjv8ajm76vfvnxsszda5bq45bim"; libraryHaskellDepends = [ @@ -244139,7 +243822,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Refinement types with static and runtime checking"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "refined-http-api-data" = callPackage @@ -249075,6 +248757,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "retry_0_9_3_1" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl + , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time + , transformers, unliftio-core + }: + mkDerivation { + pname = "retry"; + version = "0.9.3.1"; + sha256 = "1mky1dfllmx6dr1gayf636n3z5xrfmam3rhs5vx7c3wj9c8kabk2"; + libraryHaskellDepends = [ + base exceptions ghc-prim mtl mtl-compat random transformers + unliftio-core + ]; + testHaskellDepends = [ + base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm + tasty tasty-hedgehog tasty-hunit time transformers unliftio-core + ]; + description = "Retry combinators for monadic actions that may fail"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "retry-effectful" = callPackage ({ mkDerivation, base, effectful-core, exceptions, retry, tasty , tasty-hunit @@ -252762,6 +252466,22 @@ self: { license = lib.licenses.publicDomain; }) {}; + "rvar_0_3_0_2" = callPackage + ({ mkDerivation, base, bytestring, MonadPrompt, mtl, random + , transformers + }: + mkDerivation { + pname = "rvar"; + version = "0.3.0.2"; + sha256 = "1ml8xz5hhjbb4vr89kfibzv3kw0qp7c6bmkja89dir04i9sx0f2i"; + libraryHaskellDepends = [ + base bytestring MonadPrompt mtl random transformers + ]; + description = "Random Variables"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "rwlock" = callPackage ({ mkDerivation, base, monad-loops-stm, stm, syb }: mkDerivation { @@ -252836,8 +252556,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, s-cargot, text }: mkDerivation { pname = "s-cargot-letbind"; - version = "0.2.3.0"; - sha256 = "1fl7a9cny1l6swxyaw4x1izl2l6rxha6zz2k1bjw1ldwzhsrip83"; + version = "0.2.4.0"; + sha256 = "1q6rn25c95y9pa96v3p715hkqdagcf92ih9myqimp107c4ma8gn1"; libraryHaskellDepends = [ base s-cargot text ]; testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; @@ -253141,6 +252861,18 @@ self: { broken = true; }) {}; + "safe-gen" = callPackage + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: + mkDerivation { + pname = "safe-gen"; + version = "1.0.1"; + sha256 = "1fl9z385lkzxfk88mdcclh965zfsn7f8nz75g6msarsmwaf4l913"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; + description = "Recursive Arbitrary instances without headaches"; + license = lib.licenses.bsd3; + }) {}; + "safe-globals" = callPackage ({ mkDerivation, base, stm, template-haskell }: mkDerivation { @@ -254105,8 +253837,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.3.0"; - sha256 = "14bg7hkbjdhwvzw4nqyv6jl1ylc3g0daswrdywzf1v8ir3137w45"; + version = "0.1.3.1"; + sha256 = "05x418al128vllrf5rcxl1asqm3lvviizgv3dhiw1pp1zppz4kk4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254137,7 +253869,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "sandwich_0_1_3_1" = callPackage + "sandwich_0_1_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lifted-async, microlens, microlens-th @@ -254148,8 +253880,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.3.1"; - sha256 = "05x418al128vllrf5rcxl1asqm3lvviizgv3dhiw1pp1zppz4kk4"; + version = "0.1.3.2"; + sha256 = "0ijxvyd73xsaaci1kxwgs2k5gj9ax697bd84f7i068g8rc18nyak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254202,15 +253934,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "sandwich-hedgehog_0_1_2_0" = callPackage + "sandwich-hedgehog_0_1_3_0" = callPackage ({ mkDerivation, base, free, hedgehog, monad-control, mtl , safe-exceptions, sandwich, string-interpolate, text, time, vty , wl-pprint-annotated }: mkDerivation { pname = "sandwich-hedgehog"; - version = "0.1.2.0"; - sha256 = "1vaf2paszycknjq4dl190vp8fc9rp7mxdi8m1ixj2nj8ymvsxvq6"; + version = "0.1.3.0"; + sha256 = "0wf16y9a8savdviyr29dpji9ij26zcn3jrsf297ywrlbd00n7g1h"; libraryHaskellDepends = [ base free hedgehog monad-control mtl safe-exceptions sandwich string-interpolate text time vty wl-pprint-annotated @@ -254244,6 +253976,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-quickcheck_0_1_0_7" = callPackage + ({ mkDerivation, base, free, monad-control, mtl, QuickCheck + , safe-exceptions, sandwich, text, time + }: + mkDerivation { + pname = "sandwich-quickcheck"; + version = "0.1.0.7"; + sha256 = "10l3k71lhppss9fdckp4wm3wd16ljg9jy3vq4gsmkzccs66wy7x8"; + libraryHaskellDepends = [ + base free monad-control mtl QuickCheck safe-exceptions sandwich + text time + ]; + testHaskellDepends = [ + base free monad-control mtl QuickCheck safe-exceptions sandwich + text time + ]; + description = "Sandwich integration with QuickCheck"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-slack" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich @@ -254862,17 +254615,17 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_9_2" = callPackage + "sbv_10_1" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process + , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden , tasty-hunit, tasty-quickcheck, template-haskell, text, time , transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "9.2"; - sha256 = "0qmjdklrjcvyfkqbwafs79arjg46icnsbq018j0c6aqzhl94zknf"; + version = "10.1"; + sha256 = "1hi3pz404ffaihv7h8svakjdzn7hypvissprpw1iz1ckfws5bf6s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -254880,7 +254633,7 @@ self: { transformers uniplate ]; testHaskellDepends = [ - base bytestring containers directory filepath hlint mtl process + base bytestring containers deepseq directory filepath mtl process QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck ]; testSystemDepends = [ z3 ]; @@ -254916,8 +254669,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.4.4"; - sha256 = "0ibz3drbr6x4mx5253gwg2gmfvf6933x8nazlg3hf8f6zwmhcm4f"; + version = "9.6.1"; + sha256 = "1qawdaaijlq1yaynjycf73vk1cl3r0p937byybaf40c1n9n78ccs"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -255990,6 +255743,8 @@ self: { pname = "scotty"; version = "0.12.1"; sha256 = "0jnv2k37yv7hbm21w356ml4b14avlwh8yyzwwwfrwpbn6zzk6ahy"; + revision = "1"; + editedCabalFile = "04l4vr53can02jyl6yfxis61al03f4i1p5l2vmdwd8qb3g9026xs"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions http-types @@ -258768,8 +258523,8 @@ self: { pname = "serialise"; version = "0.2.6.0"; sha256 = "05m5h5vfjp4wvh6y7j2f3d4c3l6gxww2n1v38vqrjacpw641izwk"; - revision = "2"; - editedCabalFile = "0ng4gjxwv2arm1ybqkfl66p1lmcwacym8ygi6nnkygysgchwqa3b"; + revision = "3"; + editedCabalFile = "1j94b6ry6m86qi9fi4mxwf8qbfai8mv8cwgjw725hbjmmvham97b"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -260292,6 +260047,8 @@ self: { pname = "servant-jsonrpc"; version = "1.1.1"; sha256 = "0x5anjs6r7xgd2aqvs3fw4jr9yjz92a7pwa5ydpz63ijw2784j9z"; + revision = "1"; + editedCabalFile = "013m5rxs6cl75lhkj4p81jwsrmpywcd1cf7pkxq4kblg3in8bgy0"; libraryHaskellDepends = [ aeson base http-media servant text ]; description = "JSON-RPC messages and endpoints"; license = lib.licenses.bsd3; @@ -260305,8 +260062,8 @@ self: { pname = "servant-jsonrpc-client"; version = "1.1.0"; sha256 = "0d18qajwpq6np0a61i5qm1z7iwvqrmgixg627diwr1xh4ws1ij8d"; - revision = "1"; - editedCabalFile = "18pnv3j61ah0dvk4pdkrgfv3862nmg2qn3nx8gica5qlbifdj2wm"; + revision = "2"; + editedCabalFile = "0khfc661yxsnv2vrxcqfj892r3w2ngx3n8mngmrywl0217wh2s87"; libraryHaskellDepends = [ aeson base servant servant-client-core servant-jsonrpc ]; @@ -260320,8 +260077,8 @@ self: { }: mkDerivation { pname = "servant-jsonrpc-server"; - version = "2.1.1"; - sha256 = "1l26zqmxr89mip8znidj5lljl1kj7lpmhxnj8ranvinn3zgk3vck"; + version = "2.1.2"; + sha256 = "0gbmpv1j4za01vwrygngbcs1pzjbfmc043yy57rq0yzvbcm1bmh7"; libraryHaskellDepends = [ aeson base containers servant servant-jsonrpc servant-server ]; @@ -265977,6 +265734,8 @@ self: { pname = "simple-sendfile"; version = "0.2.30"; sha256 = "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn"; + revision = "1"; + editedCabalFile = "0g1fn6lcl6zi08miqrg5qyhvwr328yh5mqa5lkbvm5mvk50wiqly"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -271402,6 +271161,8 @@ self: { ]; description = "Self-Organising Maps"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "some" = callPackage @@ -275987,32 +275748,6 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.1.2"; - sha256 = "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq"; - libraryHaskellDepends = [ - aeson async base binary data-default-class deepseq - dense-linear-algebra math-functions mwc-random parallel primitive - random vector vector-algorithms vector-binary-instances - vector-th-unbox - ]; - testHaskellDepends = [ - aeson base binary dense-linear-algebra erf ieee754 math-functions - primitive QuickCheck tasty tasty-expected-failure tasty-hunit - tasty-quickcheck vector vector-algorithms - ]; - description = "A library of statistical types, data, and functions"; - license = lib.licenses.bsd2; - }) {}; - - "statistics_0_16_2_0" = callPackage - ({ mkDerivation, aeson, async, base, binary, data-default-class - , deepseq, dense-linear-algebra, erf, ieee754, math-functions - , mwc-random, parallel, primitive, QuickCheck, random, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector - , vector-algorithms, vector-binary-instances, vector-th-unbox - }: - mkDerivation { - pname = "statistics"; version = "0.16.2.0"; sha256 = "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk"; libraryHaskellDepends = [ @@ -276028,7 +275763,6 @@ self: { ]; description = "A library of statistical types, data, and functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "statistics-dirichlet" = callPackage @@ -277814,29 +277548,6 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.2.5"; - sha256 = "0157xjz8nhr65y9rm7rdf3pnjlrsgaqam7qfg7nqq91bvfdq2l6a"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_6" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, hspec-discover, network, process, QuickCheck - , random, stm, text, transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; version = "0.2.2.6"; sha256 = "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"; libraryHaskellDepends = [ @@ -277851,7 +277562,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -281764,6 +281474,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "swagger2_2_8_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.8.7"; + sha256 = "021pshm4i5wvlixgr251xzk36bpx42920pfcvq1w4sakx8x9fyli"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -284365,6 +284108,8 @@ self: { pname = "tabular"; version = "0.2.2.8"; sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb"; + revision = "1"; + editedCabalFile = "1llb610scvdb9grkd0y7ilh39a3v2pnkgaknabq2an3izr49z01r"; libraryHaskellDepends = [ base csv html mtl ]; description = "Two-dimensional data tables with rendering functions"; license = lib.licenses.bsd3; @@ -285710,17 +285455,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3_4" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3.4"; + sha256 = "07nfm7wahfybnlazisf4xn70l25c4lzm190lpakwprdgmzmp3rjd"; + libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; + benchmarkHaskellDepends = [ base ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-checklist" = callPackage - ({ mkDerivation, base, doctest, exceptions, HUnit + ({ mkDerivation, base, containers, doctest, exceptions, HUnit , parameterized-utils, tasty, tasty-expected-failure, tasty-hunit , text }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.5.1"; - sha256 = "0gllg2n5x8r8s3mkb5ymh4mhwhi96x93pdfngz3zccjzxbp5rmsx"; + version = "1.0.6.0"; + sha256 = "1b5qikkbz4hxpj9w1vcfz1pigxs9576b84bp2p15bcrxpq80a0vq"; libraryHaskellDepends = [ - base exceptions parameterized-utils text + base containers exceptions parameterized-utils text ]; testHaskellDepends = [ base doctest HUnit parameterized-utils tasty tasty-expected-failure @@ -286353,6 +286111,8 @@ self: { description = "Bencmarking using instruction counting"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) papi;}; "tasty-prelude" = callPackage @@ -288681,8 +288441,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.5.1.0"; - sha256 = "1blavadij1cvjp0dknsczvsms4ma7hh31zd8bmiksravxpcmdbw5"; + version = "0.7.4.0"; + sha256 = "0zzybsb711x2bxbj99j507b6x7jhmxlhl690w9zzxzyk87pahkjv"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers cryptonite exceptions finite-typelits generic-deriving http-client @@ -299696,25 +299456,6 @@ self: { }: mkDerivation { pname = "type-errors"; - version = "0.2.0.1"; - sha256 = "0ds1y5gjjgd2g3dsn8bfcviy6zv8nvmyaifysmb7ckggdfg3cdym"; - libraryHaskellDepends = [ - base first-class-families syb template-haskell th-abstraction - ]; - testHaskellDepends = [ - base doctest first-class-families syb template-haskell - th-abstraction - ]; - description = "Tools for writing better type errors"; - license = lib.licenses.bsd3; - }) {}; - - "type-errors_0_2_0_2" = callPackage - ({ mkDerivation, base, doctest, first-class-families, syb - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "type-errors"; version = "0.2.0.2"; sha256 = "10vwi7ygwnrhw9vl0r3vx4p5dfwk7xkpd6aks6wdcwy53vfzyz39"; revision = "1"; @@ -299728,7 +299469,6 @@ self: { ]; description = "Tools for writing better type errors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-errors-pretty" = callPackage @@ -307707,6 +307447,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-instances_3_4_2" = callPackage + ({ mkDerivation, base, comonad, hashable, keys, pointed + , semigroupoids, vector + }: + mkDerivation { + pname = "vector-instances"; + version = "3.4.2"; + sha256 = "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l"; + libraryHaskellDepends = [ + base comonad hashable keys pointed semigroupoids vector + ]; + description = "Orphan Instances for 'Data.Vector'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-instances-collections" = callPackage ({ mkDerivation, base, collections-api, template-haskell, vector }: mkDerivation { @@ -307735,6 +307491,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-quicksort" = callPackage + ({ mkDerivation, atomic-counter, base, bytestring, containers + , deepseq, parallel, primitive, QuickCheck, random, stm, tasty + , tasty-bench, tasty-quickcheck, text, text-builder-linear, vector + , vector-algorithms + }: + mkDerivation { + pname = "vector-quicksort"; + version = "0.1"; + sha256 = "1s8azyaa73zys31whi2m6l0mnyy8hdw8hzsdpd5h0j3d78ywykkf"; + revision = "1"; + editedCabalFile = "18h7lflrp2d80cjzdqwjykpl95b3ng9bcrb9gq5qnab652fgyr8j"; + libraryHaskellDepends = [ base parallel primitive stm vector ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + atomic-counter base bytestring deepseq primitive random stm tasty + tasty-bench text text-builder-linear vector vector-algorithms + ]; + doHaddock = false; + description = "Fast and flexible quicksort implementation for mutable vectors"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "vector-random" = callPackage ({ mkDerivation, base, mersenne-random-pure64, vector }: mkDerivation { @@ -313040,8 +312823,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.6.0.0"; - sha256 = "0xad64jl8byjqbmz3l38f87lp7ixf8il12zlyvkp70mcd4bi0ndr"; + version = "0.6.0.1"; + sha256 = "190pjd3mw9lkx32ybwdks1d9ppqca27h8milfxlgidbiwydzg76y"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -313177,29 +312960,6 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.10.0.0"; - sha256 = "02vm6wncjzcxmakabnjklkybcyylksfkpj1za541rrjv448zi7qj"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring call-stack - data-default-class directory directory-tree exceptions filepath - http-client http-types lifted-base monad-control network - network-uri scientific temporary text time transformers - transformers-base unordered-containers vector zip-archive - ]; - description = "a Haskell client for the Selenium WebDriver protocol"; - license = lib.licenses.bsd3; - }) {}; - - "webdriver_0_10_0_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, call-stack, data-default-class, directory - , directory-tree, exceptions, filepath, http-client, http-types - , lifted-base, monad-control, network, network-uri, scientific - , temporary, text, time, transformers, transformers-base - , unordered-containers, vector, zip-archive - }: - mkDerivation { - pname = "webdriver"; version = "0.10.0.1"; sha256 = "1mwdn96f5mn8zpbh0rh8f88dh4r8mrizd44hn5n0z2gnj0dipfkp"; libraryHaskellDepends = [ @@ -313211,7 +312971,6 @@ self: { ]; description = "a Haskell client for the Selenium WebDriver protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -314471,8 +314230,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "1"; - editedCabalFile = "0l2rhhj907fa4ydzd03li7g66fkmhk5iyzks1chc9d7wf4ddgplv"; + revision = "2"; + editedCabalFile = "1zq74zgh82zcxnn9knha6qn36k4sqm93mcck45h8pd6c7yzfc0jx"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -314974,31 +314733,6 @@ self: { }: mkDerivation { pname = "with-utf8"; - version = "1.0.2.3"; - sha256 = "0ddhnnp48ndngwd81agxajig533r39wy31l49znpjqy9d1ccw1q7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base safe-exceptions text ]; - executableHaskellDepends = [ - base directory filepath process safe-exceptions text th-env - ]; - testHaskellDepends = [ - base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog - tasty-hunit temporary text unix - ]; - testToolDepends = [ tasty-discover ]; - description = "Get your IO right on the first try"; - license = lib.licenses.mpl20; - mainProgram = "utf8-troubleshoot"; - }) {}; - - "with-utf8_1_0_2_4" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, hedgehog - , HUnit, process, safe-exceptions, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix - }: - mkDerivation { - pname = "with-utf8"; version = "1.0.2.4"; sha256 = "0qpz8b5rw5p77jwcrzknqjkidkrfjlw5zh3r92giw35yzicmx7am"; isLibrary = true; @@ -315014,7 +314748,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Get your IO right on the first try"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "utf8-troubleshoot"; }) {}; @@ -317206,8 +316939,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.12.0"; - sha256 = "0w3q0qclpjdy51jdd761ykz48l5sm3q6jjy8igaf3yhsdzzg79fw"; + version = "0.13.0"; + sha256 = "0qdfj4d83b1fjmlysqncgi65ldf3qnrsj4lync95mgbaq2kzxj2r"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -317221,8 +316954,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "1.2.0"; - sha256 = "0xsjr73ayld2ra40715hk319cc353vpiv2xpv58cvwfdh76n5nsy"; + version = "1.3.0"; + sha256 = "0qj3h8j3qjqxjv2jjcywns7lb9xpnmm4rkz4gxczn9h0i868pbch"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317960,6 +317693,22 @@ self: { broken = true; }) {}; + "xml-conduit-microlens" = callPackage + ({ mkDerivation, base, case-insensitive, containers, microlens + , microlens-ghc, text, xml-conduit + }: + mkDerivation { + pname = "xml-conduit-microlens"; + version = "0.3.0.0"; + sha256 = "0yqlmk5gv1lnxp1d000z966ldjiiyma1gk1dh6yjm4nzgdzm36p6"; + libraryHaskellDepends = [ + base case-insensitive containers microlens microlens-ghc text + xml-conduit + ]; + description = "Lenses and traversals for xml-conduit based on microlens"; + license = lib.licenses.bsd3; + }) {}; + "xml-conduit-parse" = callPackage ({ mkDerivation, base, conduit, conduit-parse, containers , data-default, exceptions, parsers, resourcet, tasty, tasty-hunit @@ -321538,28 +321287,6 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.0.3"; - sha256 = "0qadhf72v71rzfzcbgfgxyf1dydf0x343n49995s6vkjx6p0kyy5"; - 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; - }) {}; - - "yesod-auth-oauth2_0_7_1_0" = 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.0"; sha256 = "112xdc5i1r1vfi95ws1jlldy6q9kv1cv6h26l3ahmmr8rqw3rz4h"; isLibrary = true; @@ -321572,7 +321299,6 @@ self: { testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-oidc" = callPackage diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index cdb539272e19e..4f110db51add1 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -58,10 +58,13 @@ stdenv.mkDerivation rec { buildPackages.libgphoto2; in '' - mkdir -p $out/lib/udev/rules.d + mkdir -p $out/lib/udev/{rules.d,hwdb.d} ${executablePrefix}/lib/libgphoto2/print-camera-list \ - udev-rules version 175 group camera \ - >$out/lib/udev/rules.d/40-gphoto2.rules + udev-rules version 201 group camera \ + >$out/lib/udev/rules.d/40-libgphoto2.rules + ${executablePrefix}/lib/libgphoto2/print-camera-list \ + hwdb version 201 group camera \ + >$out/lib/udev/hwdb.d/20-gphoto.hwdb ''; meta = { diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index a2dc93845c472..ab9e00fe389af 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , makeWrapper , meson , ninja @@ -21,22 +20,15 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw="; + sha256 = "sha256-EwBHkXFEPAEgVUGC/0e2Bae/rV5lec1ttfbJ5ce9cKw="; }; - # scdoc: mark as build-time dependency - # https://github.com/emersion/xdg-desktop-portal-wlr/pull/248 - patches = [(fetchpatch { - url = "https://github.com/emersion/xdg-desktop-portal-wlr/commit/92ccd62428082ba855e359e83730c4370cd1aac7.patch"; - hash = "sha256-mU1whfp7BoSylaS3y+YwfABImZFOeuItSXCon0C7u20="; - })]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 4588d0c04b047..02a49fd71773f 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; version = "1.24.3"; - useDune2 = true; + minimalOCamlVersion = "4.12"; - minimumOCamlVersion = "4.08"; - - src = fetchurl { - url = "https://github.com/mmottl/gsl-ocaml/releases/download/${version}/gsl-${version}.tbz"; - sha256 = "1mpzcgbrha2l8iikqbmn32668v2mnnsykxg5n5jgs0qnskn2nvrn"; + src = fetchFromGitHub { + owner = "mmottl"; + repo = "gsl-ocaml"; + rev = version; + hash = "sha256-I+u7lFEredt8ZLiba8x904eTgSUdZq82/e82B+/GIlo="; }; + patches = [ + # Switched to Dune lang 2.7 + (fetchpatch { + url = "https://github.com/mmottl/gsl-ocaml/commit/be0f6933f16fea6d6fb2e39178816974be4c3724.patch"; + sha256 = "sha256-G/4JT8XPYw+oNJEwJ9zRdUBwtNUHL+T8/htCb3qfuT8="; + }) + # Fix dune rules + (fetchpatch { + url = "https://github.com/mmottl/gsl-ocaml/commit/0b38a22d9813de27eab5caafafeabd945f298b5e.patch"; + sha256 = "sha256-S6OUDase2kR7V6fizaev5huqEAIM5QOkx3n18rj4y3w="; + }) + # Updated opam file + (fetchpatch { + url = "https://github.com/mmottl/gsl-ocaml/commit/b749455b76501c9e3623e05d659565eab7292602.patch"; + sha256 = "sha256-/GACjI3cRCApyGyk1kQp0rB/Hae8DIR9zs6q9KiS1ZQ="; + }) + # Used new OCaml 4.12 C-macros + (fetchpatch { + url = "https://github.com/mmottl/gsl-ocaml/commit/cca79ea56a7ee83a4c67b432decdaef3de8c9d30.patch"; + sha256 = "sha256-bsIKkvj9W8oAYSvP6ZfbqSgt5fSirc780O08WBhVRmI="; + }) + ]; + + duneVersion = "3"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix index ebdbbc4ac5483..12c4197e7fee3 100644 --- a/pkgs/development/tools/xc/default.nix +++ b/pkgs/development/tools/xc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "xc"; - version = "0.1.181"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C6qZdO6+n9BWm69y09kvnEBF45sB6bfOfmteNO2x68I="; + sha256 = "sha256-e/cJ1kVFUs2chOpqu2tHsK9MBhlMx9u6mIa5uUwvVg8="; }; - vendorHash = "sha256-cySflcTuAzbFZbtXmzZ98nfY8HUq1UedONTtKP4EICs="; + vendorHash = "sha256-hCdIO377LiXFKz0GfCmAADTPfoatk8YWzki7lVP3yLw="; meta = with lib; { homepage = "https://xcfile.dev/"; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix new file mode 100644 index 0000000000000..f5f3d463f4307 --- /dev/null +++ b/pkgs/development/web/nodejs/v20.nix @@ -0,0 +1,19 @@ +{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; + +in +buildNodejs { + inherit enableNpm; + version = "20.0.0"; + sha256 = "sha256-dFDnV5Vo99HLOYGFz85HLaKDeyqjbFliCyLOS5d7XLU="; + patches = [ + ./revert-arm64-pointer-auth.patch + ./disable-darwin-v8-system-instrumentation-node19.patch + ./bypass-darwin-xcrun-node16.patch + ]; +} diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index bf82e7d903503..38cb2c806f685 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -17,6 +17,8 @@ , rustPlatform , writeShellScriptBin , yarn +, swift +, AVKit , CoreAudio }: @@ -138,7 +140,7 @@ python3.pkgs.buildPythonApplication { ninja qt6.wrapQtAppsHook rsync - ]; + ] ++ lib.optional stdenv.isDarwin swift; nativeCheckInputs = with python3.pkgs; [ pytest mock astroid ]; buildInputs = [ @@ -186,7 +188,10 @@ python3.pkgs.buildPythonApplication { waitress werkzeug zipp - ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ]; + ] ++ lib.optionals stdenv.isDarwin [ + AVKit + CoreAudio + ]; # Activate optimizations RELEASE = true; diff --git a/pkgs/servers/fedigroups/Cargo.lock b/pkgs/servers/fedigroups/Cargo.lock index 14ad1dc963d0c..6a2cfdce28d49 100644 --- a/pkgs/servers/fedigroups/Cargo.lock +++ b/pkgs/servers/fedigroups/Cargo.lock @@ -13,27 +13,28 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "anyhow" -version = "1.0.43" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" +checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd" [[package]] name = "atty" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ + "hermit-abi", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -44,9 +45,9 @@ checksum = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -97,7 +98,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -111,9 +112,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-tools" @@ -123,9 +124,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.3.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -139,25 +140,15 @@ dependencies = [ [[package]] name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "c2-chacha" -version = "0.2.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -dependencies = [ - "lazy_static", - "ppv-lite86", -] +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cc" -version = "1.0.69" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cfg-if" @@ -173,22 +164,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.9" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", "num-traits", "serde", "time", + "winapi 0.3.9", ] [[package]] name = "clap" -version = "2.33.0" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -210,9 +202,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -220,15 +212,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -258,7 +250,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -269,9 +261,9 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" [[package]] name = "dtoa" -version = "0.4.4" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "elefren" @@ -283,7 +275,7 @@ dependencies = [ "futures-util", "hyper-old-types", "isolang", - "log 0.4.14", + "log 0.4.17", "reqwest", "serde", "serde_json", @@ -293,18 +285,18 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tungstenite", - "tokio-util", + "tokio-util 0.6.7", "toml", "url 2.2.2", ] [[package]] name = "encoding_rs" -version = "0.8.20" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -315,7 +307,7 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log 0.4.17", "regex", "termcolor", ] @@ -327,16 +319,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] name = "fedigroups" -version = "0.4.4" +version = "0.4.5" dependencies = [ "anyhow", "clap", "elefren", "env_logger", - "futures 0.3.16", + "futures 0.3.21", "json5", - "log 0.4.14", + "log 0.4.17", "native-tls", "once_cell", "regex", @@ -351,9 +352,9 @@ dependencies = [ [[package]] name = "fnv" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foreign-types" @@ -404,15 +405,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -425,9 +426,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -435,15 +436,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -452,18 +453,16 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -471,23 +470,22 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "autocfg 1.0.1", "futures-channel", "futures-core", "futures-io", @@ -497,8 +495,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -513,43 +509,32 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "getrandom" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "wasi 0.7.0", -] - -[[package]] -name = "getrandom" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "h2" -version = "0.3.3" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "fnv", "futures-core", "futures-sink", @@ -558,49 +543,58 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.3", "tracing", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] name = "http" -version = "0.2.4" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "fnv", - "itoa", + "itoa 1.0.2", ] [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "http", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -629,11 +623,11 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", @@ -642,8 +636,8 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", - "pin-project", + "itoa 1.0.2", + "pin-project-lite", "socket2", "tokio", "tower-service", @@ -661,7 +655,7 @@ dependencies = [ "bytes 0.4.12", "httparse", "language-tags", - "log 0.4.14", + "log 0.4.17", "mime 0.3.16", "percent-encoding 1.0.1", "time", @@ -675,8 +669,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "futures-util", - "hyper 0.14.4", - "log 0.4.14", + "hyper 0.14.19", + "log 0.4.17", "rustls", "tokio", "tokio-rustls", @@ -696,9 +690,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -707,19 +701,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "hashbrown", ] [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -752,15 +746,21 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.4" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "js-sys" -version = "0.3.53" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" dependencies = [ "wasm-bindgen", ] @@ -800,9 +800,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.99" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "lock_api" @@ -816,10 +816,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg 1.1.0", "scopeguard 1.1.0", ] @@ -829,14 +830,14 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.14", + "log 0.4.17", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -849,15 +850,21 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" @@ -876,9 +883,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mime_guess" -version = "2.0.1" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime 0.3.16", "unicase 2.6.0", @@ -896,8 +903,8 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.14", - "miow 0.2.2", + "log 0.4.17", + "miow", "net2", "slab", "winapi 0.2.8", @@ -905,15 +912,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", - "log 0.4.14", - "miow 0.3.7", - "ntapi", - "winapi 0.3.8", + "log 0.4.17", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -929,23 +935,14 @@ dependencies = [ ] [[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", - "log 0.4.14", + "log 0.4.17", "openssl", "openssl-probe", "openssl-sys", @@ -963,51 +960,43 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", - "winapi 0.3.8", -] - -[[package]] -name = "ntapi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" -dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "num-integer" -version = "0.1.41" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 0.1.6", + "autocfg 1.1.0", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.8" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ - "autocfg 0.1.6", + "autocfg 1.1.0", ] [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ + "hermit-abi", "libc", ] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opaque-debug" @@ -1023,31 +1012,43 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.36" +version = "0.10.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] [[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.66" +version = "0.9.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" +checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cc", "libc", "pkg-config", @@ -1056,9 +1057,9 @@ dependencies = [ [[package]] name = "owning_ref" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" dependencies = [ "stable_deref_trait", ] @@ -1075,13 +1076,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", + "lock_api 0.4.7", + "parking_lot_core 0.9.3", ] [[package]] @@ -1093,22 +1093,21 @@ dependencies = [ "libc", "rand 0.6.5", "rustc_version", - "smallvec 0.6.10", - "winapi 0.3.8", + "smallvec 0.6.14", + "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", - "instant", "libc", - "redox_syscall 0.2.10", - "smallvec 1.6.1", - "winapi 0.3.8", + "redox_syscall", + "smallvec 1.8.1", + "windows-sys", ] [[package]] @@ -1206,18 +1205,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -1226,9 +1225,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1238,42 +1237,30 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.16" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.2" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -1288,38 +1275,24 @@ dependencies = [ "libc", "rand_chacha 0.1.1", "rand_core 0.4.2", - "rand_hc 0.1.0", + "rand_hc", "rand_isaac", "rand_jitter", "rand_os", "rand_pcg", "rand_xorshift", - "winapi 0.3.8", -] - -[[package]] -name = "rand" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -dependencies = [ - "getrandom 0.1.12", - "libc", - "rand_chacha 0.2.1", - "rand_core 0.5.1", - "rand_hc 0.2.0", + "winapi 0.3.9", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -1334,16 +1307,6 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -dependencies = [ - "c2-chacha", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" @@ -1369,20 +1332,11 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.12", -] - -[[package]] -name = "rand_core" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom", ] [[package]] @@ -1395,24 +1349,6 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] name = "rand_isaac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1429,7 +1365,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" dependencies = [ "libc", "rand_core 0.4.2", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1443,7 +1379,7 @@ dependencies = [ "libc", "rand_core 0.4.2", "rdrand", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1476,24 +1412,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "redox_syscall" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -1502,17 +1432,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "remove_dir_all" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1522,18 +1452,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ "base64 0.13.0", - "bytes 1.0.1", + "bytes 1.1.0", "encoding_rs", "futures-core", "futures-util", "http", "http-body", - "hyper 0.14.4", + "hyper 0.14.19", "hyper-rustls", "ipnet", "js-sys", "lazy_static", - "log 0.4.14", + "log 0.4.17", "mime 0.3.16", "mime_guess", "percent-encoding 2.1.0", @@ -1564,7 +1494,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1583,7 +1513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.0", - "log 0.4.14", + "log 0.4.17", "ring", "sct", "webpki", @@ -1603,9 +1533,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.0" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "safemem" @@ -1615,12 +1545,12 @@ checksum = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" [[package]] name = "schannel" -version = "0.1.16" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "winapi 0.3.8", + "windows-sys", ] [[package]] @@ -1647,9 +1577,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -1660,9 +1590,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.3.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", @@ -1685,18 +1615,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.127" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -1705,11 +1635,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ - "itoa", + "itoa 1.0.2", "ryu", "serde", ] @@ -1732,7 +1662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" dependencies = [ "dtoa", - "itoa", + "itoa 0.4.8", "serde", "url 2.2.2", ] @@ -1744,7 +1674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] @@ -1763,9 +1693,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -1791,31 +1721,33 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "0.6.10" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" [[package]] name = "socket2" -version = "0.3.19" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ - "cfg-if 1.0.0", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1826,9 +1758,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "stable_deref_trait" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stfu8" @@ -1848,34 +1780,34 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.74" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "tempfile" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.7.2", - "redox_syscall 0.1.56", + "redox_syscall", "remove_dir_all", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -1891,18 +1823,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -1911,33 +1843,48 @@ dependencies = [ [[package]] name = "time" -version = "0.1.42" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "redox_syscall 0.1.56", - "winapi 0.3.8", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", ] [[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] name = "tokio" -version = "1.10.0" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "autocfg 1.0.1", - "bytes 1.0.1", + "bytes 1.1.0", "libc", "memchr", - "mio 0.7.13", + "mio 0.8.4", "num_cpus", "once_cell", - "parking_lot 0.11.1", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1947,7 +1894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.31", "tokio-io", ] @@ -1958,7 +1905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" dependencies = [ "crossbeam-utils", - "futures 0.1.29", + "futures 0.1.31", ] [[package]] @@ -1968,15 +1915,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", - "log 0.4.14", + "futures 0.1.31", + "log 0.4.17", ] [[package]] name = "tokio-macros" -version = "1.3.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -1990,9 +1937,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" dependencies = [ "crossbeam-utils", - "futures 0.1.29", + "futures 0.1.31", "lazy_static", - "log 0.4.14", + "log 0.4.17", "mio 0.6.23", "num_cpus", "parking_lot 0.7.1", @@ -2015,9 +1962,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", "pin-project-lite", @@ -2031,7 +1978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7" dependencies = [ "fnv", - "futures 0.1.29", + "futures 0.1.31", ] [[package]] @@ -2041,7 +1988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.31", "iovec", "mio 0.6.23", "tokio-io", @@ -2054,7 +2001,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" dependencies = [ - "futures 0.1.29", + "futures 0.1.31", "native-tls", "tokio-io", ] @@ -2066,7 +2013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" dependencies = [ "futures-util", - "log 0.4.14", + "log 0.4.17", "pin-project", "rustls", "tokio", @@ -2082,34 +2029,48 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", + "futures-core", + "futures-sink", + "log 0.4.17", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +dependencies = [ + "bytes 1.1.0", "futures-core", "futures-sink", - "log 0.4.14", "pin-project-lite", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -2118,11 +2079,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2133,9 +2094,9 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" [[package]] name = "try-lock" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" @@ -2145,14 +2106,14 @@ checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" dependencies = [ "base64 0.13.0", "byteorder", - "bytes 1.0.1", + "bytes 1.1.0", "http", "httparse", - "log 0.4.14", - "rand 0.8.4", + "log 0.4.17", + "rand 0.8.5", "rustls", "rustls-native-certs", - "sha-1 0.9.7", + "sha-1 0.9.8", "thiserror", "url 2.2.2", "utf-8", @@ -2167,9 +2128,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -2192,44 +2153,41 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.8" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" +checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd" dependencies = [ - "smallvec 0.6.10", + "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" - -[[package]] -name = "unicode-xid" -version = "0.2.0" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "untrusted" @@ -2255,7 +2213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.0", + "idna 0.2.3", "matches", "percent-encoding 2.1.0", ] @@ -2274,9 +2232,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" @@ -2286,9 +2244,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "voca_rs" @@ -2307,27 +2265,27 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.14", + "log 0.4.17", "try-lock", ] [[package]] name = "wasi" -version = "0.7.0" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.76" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ "cfg-if 1.0.0", "serde", @@ -2337,13 +2295,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.76" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", + "log 0.4.17", "proc-macro2", "quote", "syn", @@ -2352,9 +2310,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" +checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2364,9 +2322,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.76" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2374,9 +2332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.76" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ "proc-macro2", "quote", @@ -2387,15 +2345,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.76" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "web-sys" -version = "0.3.53" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" dependencies = [ "js-sys", "wasm-bindgen", @@ -2427,7 +2385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "723abe6b75286edc51d8ecabb38a2353f62a9e9b0588998b59111474f1dcd637" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.31", "hyper 0.10.16", "native-tls", "rand 0.6.5", @@ -2451,7 +2409,7 @@ dependencies = [ "bitflags", "byteorder", "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.31", "native-tls", "rand 0.6.5", "sha-1 0.8.2", @@ -2469,9 +2427,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -2495,7 +2453,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2505,12 +2463,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] name = "winreg" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index c3b3634b4fc80..0b9fa4c2a0588 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -3,22 +3,30 @@ , fetchFromGitea , rustPlatform , pkg-config +, git , openssl , Security }: rustPlatform.buildRustPackage rec { pname = "fedigroups"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitea { domain = "git.ondrovo.com"; owner = "MightyPork"; repo = "group-actor"; rev = "v${version}"; - sha256 = "sha256-1WqIQp16bs+UB+NSEZn0JH6NOkuAx8iUfho4roA2B00="; + sha256 = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0="; + forceFetchGit = true; # Archive generation is disabled on this gitea instance + leaveDotGit = true; # git command in build.rs }; + # The lockfile in the repo is not up to date + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -28,6 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + git ]; buildInputs = [ diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 312c2a475a64a..1c7c312bd73ab 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-FQKZVkPD4DQKMduWW2g9vD1vvaFlU6QpNEj+g3yeE2Q="; + sha256 = "jxo6qQLIhwT6cqhYWx+5GEnuS9E7O2u82QrzxabjcOs="; }; - cargoHash = "sha256-scKbu69lrEfUpErs6gZyZOGb3OwCzDThbs6O0ZtJX/8="; + cargoHash = "sha256-1wDlYQXRJSkXyQU7H+mQWtsLSpX7i7SdmFYLjyRWfx8="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index be9438f2616da..9df7d835d031c 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -31,7 +31,7 @@ index d5c1c8bb10..88c77e8142 100755 - log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") - log.error(" %s", e) - return find_lib("libfakeXinerama.so.1") -+ return "@libfakeXinerama@/lib/libfakeXinerama.so.1" ++ return "@libfakeXinerama@/lib/libfakeXinerama.so.1.0" current_xinerama_config = None diff --git a/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/tools/misc/chatgpt-cli/default.nix index 0b444893e5f41..661e38a025952 100644 --- a/pkgs/tools/misc/chatgpt-cli/default.nix +++ b/pkgs/tools/misc/chatgpt-cli/default.nix @@ -5,18 +5,22 @@ }: buildGoModule rec { pname = "chatgpt"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "j178"; repo = pname; rev = "v${version}"; - hash = "sha256-sGcVtppw1q05ICcYyRcF2gpFCzbBftaxAM4X4/k48as="; + hash = "sha256-5tEtkEDQxWFVWyK7uipm20yccCPkCDaMLzS25MmGRbE="; }; - vendorHash = "sha256-lD9G8N1BpWda2FAi80qzvdiQXoJIWl529THYMfQmXtg="; + vendorHash = "sha256-q1+4KExXth7+UC8h0+M6ChnW7T1j468umi7Q1jwnzgo="; - subPackages = [ "." ]; + subPackages = [ "cmd" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/$pname + ''; meta = with lib; { description = "Interactive CLI for ChatGPT"; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index e1fa8cc0b730d..71adf5fe0f055 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.3"; + version = "5.2.5"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-bbePMbI1YF0YvakO5vlURdE7UG3pLiuByImYvDq9cRY="; + sha256 = "sha256-FzLL4FCAT9iZ6YFlzc+D5LPg89L/s9dIum/DoFe61Es="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index ec2e5b634e370..e9513d4303c15 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.64.0"; + version = "1.65.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-XHHoPaT+qo2UBfYvslFhhSmo7a9YsBX3Ay+piOBVTxc="; + hash = "sha256-/RyDv256qbi1CMHmB2LZxMBqOM81nA3r5N8jRrww/mQ="; }; - vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; + vendorHash = "sha256-qT8YhNZ+9n9+VduW8a/tr74w3OyWue7a51667Q9dMCg="; CGO_CFLAGS = [ "-Wno-format-security" ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index f1746f931eee4..8fe7182898cc7 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.24.2"; + version = "2.24.3"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-d8AXKUlIbIuzQMj963uaArt+DakIi08aXtEFVYbm/oE="; + hash = "sha256-8sJdt7lM/Ut/mtCoN2QZjtqh1fiWbI9taiLlnnx66PE="; }; vendorHash = "sha256-ZgBt4BgZWViNqYCuqb/Wt1zVjFM9h1UsmsYox7kMJ1A="; diff --git a/pkgs/tools/text/zet/default.nix b/pkgs/tools/text/zet/default.nix new file mode 100644 index 0000000000000..50d149f4e6559 --- /dev/null +++ b/pkgs/tools/text/zet/default.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "zet"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "yarrow"; + repo = "zet"; + rev = "v${version}"; + hash = "sha256-IjM+jSb+kdML0zZGuz9+9wrFzQCujn/bg9/vaTzMtUs="; + }; + + cargoHash = "sha256-kHIOsSR7ZxBzp4dtm2hbi8ddtlQ86x5EASk5HFmnhFo="; + + # tests fail with `--release` + # https://github.com/yarrow/zet/pull/7 + checkType = "debug"; + + meta = with lib; { + description = "CLI utility to find the union, intersection, set difference, etc of files considered as sets of lines"; + homepage = "https://github.com/yarrow/zet"; + changelog = "https://github.com/yarrow/zet/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192804d930d8f..fe854af265e5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9401,9 +9401,13 @@ with pkgs; nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { enableNpm = false; }; + nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; + nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-19_x; - nodejs-slim_latest = nodejs-slim-19_x; + nodejs_latest = nodejs_20; + nodejs-slim_latest = nodejs-slim_20; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; @@ -14037,6 +14041,8 @@ with pkgs; zerofree = callPackage ../tools/filesystems/zerofree { }; + zet = callPackage ../tools/text/zet { }; + zfp = callPackage ../tools/compression/zfp { }; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; @@ -35659,7 +35665,7 @@ with pkgs; angband = callPackage ../games/angband { }; anki = callPackage ../games/anki { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio; }; anki-bin = callPackage ../games/anki/bin.nix { }; |