diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 6b2ea63624af..709b67607f7b 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -96,7 +96,9 @@ in { ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabin32; }) - ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; }); + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabielfv1; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabielfv2; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 65dc9c07e346..0d9f67037764 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -22,12 +22,11 @@ rec { }; ppc64 = { - config = "powerpc64-unknown-linux-gnu"; - gcc = { abi = "elfv2"; }; # for gcc configuration + config = "powerpc64-unknown-linux-gnuabielfv2"; }; ppc64-musl = { config = "powerpc64-unknown-linux-musl"; - gcc = { abi = "elfv2"; }; # for gcc configuration + gcc = { abi = "elfv2"; }; }; sheevaplug = { diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 54d398018e0b..ee213438e048 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -13,6 +13,13 @@ rec { isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; isPower = { cpu = { family = "power"; }; }; isPower64 = { cpu = { family = "power"; bits = 64; }; }; + # This ABI is the default in NixOS PowerPC64 BE, but not on mainline GCC, + # so it sometimes causes issues in certain packages that makes the wrong + # assumption on the used ABI. + isAbiElfv2 = [ + { abi = { abi = "elfv2"; }; } + { abi = { name = "musl"; }; cpu = { family = "power"; bits = 64; }; } + ]; isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; @@ -65,7 +72,7 @@ rec { isNone = { kernel = kernels.none; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; - isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ]; + isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index be5b1a0892bb..ac450534fe1e 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -353,6 +353,11 @@ rec { The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. ''; } + { assertion = platform: with platform; !(isPower64 && isBigEndian); + message = '' + The "gnu" ABI is ambiguous on big-endian 64-bit PowerPC. Use "gnuabielfv2" or "gnuabielfv1" instead. + ''; + } ]; }; gnuabi64 = { abi = "64"; }; @@ -364,6 +369,9 @@ rec { gnuabin32 = { abi = "n32"; }; muslabin32 = { abi = "n32"; }; + gnuabielfv2 = { abi = "elfv2"; }; + gnuabielfv1 = { abi = "elfv1"; }; + musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; musl = {}; @@ -467,6 +475,8 @@ rec { if lib.versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi + # Default ppc64 BE to ELFv2 + else if isPower64 parsed && isBigEndian parsed then abis.gnuabielfv2 else abis.gnu else abis.unknown; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5643d3039bb..c143cd2afcaa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5781,6 +5781,16 @@ github = "jacg"; githubId = 2570854; }; + jakehamilton = { + name = "Jake Hamilton"; + email = "jake.hamilton@hey.com"; + matrix = "@jakehamilton:matrix.org"; + github = "jakehamilton"; + githubId = 7005773; + keys = [{ + fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; + }]; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -6540,6 +6550,12 @@ githubId = 705123; name = "Jan Tojnar"; }; + jtrees = { + email = "me@jtrees.io"; + github = "jtrees"; + githubId = 5802758; + name = "Joshua Trees"; + }; juaningan = { email = "juaningan@gmail.com"; github = "uningan"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a593aa04e9fa..cc7a8b3d27e3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -188,6 +188,14 @@ services.hadoop.hbase. + + + Sachet, + an SMS alerting tool for the Prometheus Alertmanager. + Available as + services.prometheus.sachet. + + infnoise, @@ -255,6 +263,14 @@ services.patroni. + + + WriteFreely, + a simple blogging platform with ActivityPub support. Available + as + services.writefreely. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 23d6c5e41b6c..2a1b4a423617 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -70,6 +70,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). +- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). + - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). @@ -92,6 +94,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. Available as [services.patroni](options.html#opt-services.patroni.enable). +- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). + ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index d7dc6ca30074..c7577e41e2d2 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -151,7 +151,7 @@ def p_manpage(md): md.inline.rules.append('manpage') def p_admonition(md): - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) + ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::$\n*', flags=re.MULTILINE|re.DOTALL) def parse(self, m, state): return { 'type': 'admonition', diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 185eff746de0..22e580233a10 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -35,7 +35,7 @@ in networking.hostFiles = lib.mkOption { type = types.listOf types.path; - defaultText = literalDocBook "Hosts from and "; + defaultText = literalMD "Hosts from {option}`networking.hosts` and {option}`networking.extraHosts`"; example = literalExpression ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]''; description = lib.mdDoc '' Files that should be concatenated together to form {file}`/etc/hosts`. diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index aa3ca549f09a..096152cefe97 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -263,7 +263,7 @@ in { (drv: drv.override { pulseaudio = overriddenPackage; }) cfg.extraModules; modulePaths = builtins.map - (drv: "${drv}/${overriddenPackage.pulseDir}/modules") + (drv: "${drv}/lib/pulseaudio/modules") # User-provided extra modules take precedence (overriddenModules ++ [ overriddenPackage ]); in lib.concatStringsSep ":" modulePaths; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index b2d546b721de..a35510b215fc 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -78,10 +78,11 @@ in defaultPackages = mkOption { type = types.listOf types.package; default = defaultPackages; - defaultText = literalDocBook '' - these packages, with their meta.priority numerically increased + defaultText = literalMD '' + these packages, with their `meta.priority` numerically increased (thus lowering their installation priority): - ${defaultPackagesText} + + ${defaultPackagesText} ''; example = []; description = lib.mdDoc '' diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 915687d1799a..dae2fde0b4e7 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -17,35 +17,35 @@ let ]); passwordDescription = '' - The options , - and + The options {option}`hashedPassword`, + {option}`password` and {option}`passwordFile` controls what password is set for the user. - overrides both - and . - overrides . + {option}`hashedPassword` overrides both + {option}`password` and {option}`passwordFile`. + {option}`password` overrides {option}`passwordFile`. If none of these three options are set, no password is assigned to the user, and the user will not be able to do password logins. - If the option is true, the + If the option {option}`users.mutableUsers` is true, the password defined in one of the three options will only be set when the user is created for the first time. After that, you are free to change the password with the ordinary user management commands. If - is false, you cannot change + {option}`users.mutableUsers` is false, you cannot change user passwords, they will always be set according to the password options. ''; hashedPasswordDescription = '' - To generate a hashed password run mkpasswd -m sha-512. + To generate a hashed password run `mkpasswd -m sha-512`. - If set to an empty string (""), this user will + If set to an empty string (`""`), this user will be able to log in without being asked for a password (but not via remote - services such as SSH, or indirectly via su or - sudo). This should only be used for e.g. bootable + services such as SSH, or indirectly via {command}`su` or + {command}`sudo`). This should only be used for e.g. bootable live systems. Note: this is different from setting an empty password, - which can be achieved using . + which can be achieved using {option}`users.users..password`. - If set to null (default) this user will not - be able to log in using a password (i.e. via login + If set to `null` (default) this user will not + be able to log in using a password (i.e. via {command}`login` command). ''; @@ -234,7 +234,7 @@ let hashedPassword = mkOption { type = with types; nullOr (passwdEntry str); default = null; - description = '' + description = lib.mdDoc '' Specifies the hashed password for the user. ${passwordDescription} ${hashedPasswordDescription} @@ -244,7 +244,7 @@ let password = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specifies the (clear text) password for the user. Warning: do not set confidential information here because it is world-readable in the Nix store. This option @@ -256,11 +256,11 @@ let passwordFile = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The full path to a file that contains the user's password. The password file is read on each system activation. The file should contain exactly one line, which should be the password in an encrypted form - that is suitable for the chpasswd -e command. + that is suitable for the `chpasswd -e` command. ${passwordDescription} ''; }; @@ -268,13 +268,13 @@ let initialHashedPassword = mkOption { type = with types; nullOr (passwdEntry str); default = null; - description = '' + description = lib.mdDoc '' Specifies the initial hashed password for the user, i.e. the hashed password assigned if the user does not already - exist. If is true, the + exist. If {option}`users.mutableUsers` is true, the password can be changed subsequently using the - passwd command. Otherwise, it's - equivalent to setting the option. + {command}`passwd` command. Otherwise, it's + equivalent to setting the {option}`hashedPassword` option. ${hashedPasswordDescription} ''; @@ -458,25 +458,25 @@ in { users.mutableUsers = mkOption { type = types.bool; default = true; - description = '' - If set to true, you are free to add new users and groups to the system - with the ordinary useradd and - groupadd commands. On system activation, the - existing contents of the /etc/passwd and - /etc/group files will be merged with the - contents generated from the users.users and - users.groups options. + description = lib.mdDoc '' + If set to `true`, you are free to add new users and groups to the system + with the ordinary `useradd` and + `groupadd` commands. On system activation, the + existing contents of the `/etc/passwd` and + `/etc/group` files will be merged with the + contents generated from the `users.users` and + `users.groups` options. The initial password for a user will be set - according to users.users, but existing passwords + according to `users.users`, but existing passwords will not be changed. - - If set to false, the contents of the user and + ::: {.warning} + If set to `false`, the contents of the user and group files will simply be replaced on system activation. This also holds for the user passwords; all changed passwords will be reset according to the - users.users configuration on activation. - + `users.users` configuration on activation. + ::: ''; }; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index b83e280b2846..acf441cda628 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -183,8 +183,8 @@ in pruneNames = mkOption { type = listOf str; default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; - defaultText = literalDocBook '' - [ ".bzr" ".cache" ".git" ".hg" ".svn" ], if + defaultText = literalMD '' + `[ ".bzr" ".cache" ".git" ".hg" ".svn" ]`, if supported by the locate implementation (i.e. mlocate or plocate). ''; description = lib.mdDoc '' diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e632a760f892..308bd8cb717b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -692,6 +692,7 @@ ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/exporters.nix ./services/monitoring/prometheus/pushgateway.nix + ./services/monitoring/prometheus/sachet.nix ./services/monitoring/prometheus/xmpp-alerts.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix @@ -1118,6 +1119,7 @@ ./services/web-apps/wiki-js.nix ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix + ./services/web-apps/writefreely.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix ./services/web-servers/agate.nix diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index ad27766b72ec..1028ef53bae1 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -71,7 +71,7 @@ in type = types.nullOr (types.enum pkgs.pinentry.flavors); example = "gnome3"; default = defaultPinentryFlavor; - defaultText = literalDocBook ''matching the configured desktop environment''; + defaultText = literalMD ''matching the configured desktop environment''; description = lib.mdDoc '' Which pinentry interface to use. If not null, the path to the pinentry binary will be passed to gpg-agent via commandline and diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix index d829bc7ae0d0..01d4c11e734a 100644 --- a/nixos/modules/services/audio/mpdscribble.nix +++ b/nixos/modules/services/audio/mpdscribble.nix @@ -128,9 +128,9 @@ in { mpdCfg.credentials).passwordFile else null; - defaultText = literalDocBook '' + defaultText = literalMD '' The first password file with read access configured for MPD when using a local instance, - otherwise null. + otherwise `null`. ''; type = types.nullOr types.str; description = lib.mdDoc '' diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index 4f045acd9568..1d443d91d199 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -61,6 +61,35 @@ let }; }; + authrpc = { + enable = lib.mkEnableOption "Go Ethereum Auth RPC API"; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc "Listen address of Go Ethereum Auth RPC API."; + }; + + port = mkOption { + type = types.port; + default = 8551; + description = lib.mdDoc "Port number of Go Ethereum Auth RPC API."; + }; + + vhosts = mkOption { + type = types.nullOr (types.listOf types.str); + default = ["localhost"]; + description = lib.mdDoc "List of virtual hostnames from which to accept requests."; + example = ["localhost" "geth.example.org"]; + }; + + jwtsecret = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc "Path to a JWT secret for authenticated RPC endpoint."; + example = "/var/run/geth/jwtsecret"; + }; + }; + metrics = { enable = lib.mkEnableOption "Go Ethereum prometheus metrics"; address = mkOption { @@ -136,7 +165,10 @@ in cfg.package ]) eachGeth); - systemd.services = mapAttrs' (gethName: cfg: ( + systemd.services = mapAttrs' (gethName: cfg: let + stateDir = "goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}"; + dataDir = "/var/lib/${stateDir}"; + in ( nameValuePair "geth-${gethName}" (mkIf cfg.enable { description = "Go Ethereum node (${gethName})"; wantedBy = [ "multi-user.target" ]; @@ -145,7 +177,7 @@ in serviceConfig = { DynamicUser = true; Restart = "always"; - StateDirectory = "goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}"; + StateDirectory = stateDir; # Hardening measures PrivateTmp = "true"; @@ -169,8 +201,10 @@ in ${if cfg.websocket.enable then ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}'' else ""} \ ${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} \ + ${if (cfg.authrpc.jwtsecret != "") then ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}'' else ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''} \ ${lib.escapeShellArgs cfg.extraArgs} \ - --datadir /var/lib/goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network} + --datadir ${dataDir} ''; }))) eachGeth; diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 5b1e9a687682..5b7790a64577 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -23,9 +23,9 @@ in { take 3 (splitString "." config.services.kubernetes.apiserver.serviceClusterIpRange )) ) + ".254"; - defaultText = literalDocBook '' - The x.y.z.254 IP of - config.${options.services.kubernetes.apiserver.serviceClusterIpRange}. + defaultText = literalMD '' + The `x.y.z.254` IP of + `config.${options.services.kubernetes.apiserver.serviceClusterIpRange}`. ''; type = types.str; }; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index cbb1cffc1694..2489cb2be7ce 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -40,7 +40,7 @@ let key = mkOption { description = lib.mdDoc "Key of taint."; default = name; - defaultText = literalDocBook "Name of this submodule."; + defaultText = literalMD "Name of this submodule."; type = str; }; value = mkOption { diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 0860b9a220c3..21877456754b 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -281,9 +281,9 @@ in type = types.path; internal = true; default = etcSlurm; - defaultText = literalDocBook '' + defaultText = literalMD '' Directory created from generated config files and - config.${opt.extraConfigPaths}. + `config.${opt.extraConfigPaths}`. ''; description = '' Path to directory with slurm config files. This option is set by default from the diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index ab1a8076c935..d9055149b77f 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -94,7 +94,7 @@ in { type = types.path; description = lib.mdDoc "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; - defaultText = literalDocBook ''generated configuration file''; + defaultText = literalMD ''generated configuration file''; example = "/etc/nixos/buildbot/master.cfg"; }; diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 8e8a65b56b78..3d29a641a195 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -168,7 +168,7 @@ let hooksPath = mkOption { type = types.path; default = hooksDir config; - defaultText = literalDocBook "generated from "; + defaultText = literalMD "generated from {option}`services.buildkite-agents..hooks`"; description = lib.mdDoc '' Path to the directory storing the hooks. Consider using {option}`services.buildkite-agents..hooks.` diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 83518344b36b..6f803236daad 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -10,7 +10,7 @@ let inherit (lib) filterAttrs - literalDocBook + literalMD literalExpression mkIf mkOption @@ -235,7 +235,7 @@ in tomlFile = mkOption { type = types.path; internal = true; - defaultText = literalDocBook "generated hercules-ci-agent.toml"; + defaultText = literalMD "generated `hercules-ci-agent.toml`"; description = '' The fully assembled config file. ''; diff --git a/nixos/modules/services/games/quake3-server.nix b/nixos/modules/services/games/quake3-server.nix index 69fdbc50d87d..ee1bb9aad47a 100644 --- a/nixos/modules/services/games/quake3-server.nix +++ b/nixos/modules/services/games/quake3-server.nix @@ -71,7 +71,7 @@ in { baseq3 = mkOption { type = types.either types.package types.path; default = defaultBaseq3; - defaultText = literalDocBook "Manually downloaded Quake 3 installation directory."; + defaultText = literalMD "Manually downloaded Quake 3 installation directory."; example = "/var/lib/q3ds"; description = lib.mdDoc '' Path to the baseq3 files (pak*.pk3). If this is on the nix store (type = package) all .pk3 files should be saved diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 86dabe71a4fa..8fa7b456f20e 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -43,24 +43,26 @@ let }; query = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The query string used to match one or more ${name}s: can be a fullpath to the temperature file (single ${name}) or a fullpath to a driver directory (multiple ${name}s). - - When multiple ${name}s match, the query can be restricted using the - or options. - + ::: {.note} + When multiple ${name}s match, the query can be restricted using the + {option}`name` or {option}`indices` options. + ::: ''; }; indices = mkOption { type = with types; nullOr (listOf ints.unsigned); default = null; - description = '' + description = lib.mdDoc '' A list of ${name}s to pick in case multiple ${name}s match the query. - Indices start from 0. + ::: {.note} + Indices start from 0. + ::: ''; }; } // optionalAttrs (name == "sensor") { @@ -81,18 +83,18 @@ let // { "${type}" = query; }; syntaxNote = name: '' - - This section slightly departs from the thinkfan.conf syntax. - The type and path must be specified like this: - - type = "tpacpi"; - query = "/proc/acpi/ibm/${name}"; - - instead of a single declaration like: - - - tpacpi: /proc/acpi/ibm/${name} - - + ::: {.note} + This section slightly departs from the thinkfan.conf syntax. + The type and path must be specified like this: + ``` + type = "tpacpi"; + query = "/proc/acpi/ibm/${name}"; + ``` + instead of a single declaration like: + ``` + - tpacpi: /proc/acpi/ibm/${name} + ``` + ::: ''; in { @@ -104,13 +106,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable thinkfan, a fan control program. - - This module targets IBM/Lenovo thinkpads by default, for - other hardware you will have configure it more carefully. - + ::: {.note} + This module targets IBM/Lenovo thinkpads by default, for + other hardware you will have configure it more carefully. + ::: ''; relatedPackages = [ "thinkfan" ]; }; @@ -131,9 +133,11 @@ in { query = "/proc/acpi/ibm/thermal"; } ]; - description = '' + description = lib.mdDoc '' List of temperature sensors thinkfan will monitor. - '' + syntaxNote "thermal"; + + ${syntaxNote "thermal"} + ''; }; fans = mkOption { @@ -143,9 +147,11 @@ in { query = "/proc/acpi/ibm/fan"; } ]; - description = '' + description = lib.mdDoc '' List of fans thinkfan will control. - '' + syntaxNote "fan"; + + ${syntaxNote "fan"} + ''; }; levels = mkOption { diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index a81dd1cdb37b..89c1be6bbf01 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -6,8 +6,6 @@ let cfg = config.services.public-inbox; stateDir = "/var/lib/public-inbox"; - manref = name: vol: "${name}${toString vol}"; - gitIni = pkgs.formats.gitIni { listsAsDuplicateKeys = true; }; iniAtom = elemAt gitIni.type/*attrsOf*/.functor.wrapped/*attrsOf*/.functor.wrapped/*either*/.functor.wrapped 0; @@ -18,7 +16,7 @@ let args = mkOption { type = with types; listOf str; default = []; - description = "Command-line arguments to pass to ${manref "public-inbox-${proto}d" 1}."; + description = lib.mdDoc "Command-line arguments to pass to {manpage}`public-inbox-${proto}d(1)`."; }; port = mkOption { type = with types; nullOr (either str port); @@ -34,13 +32,13 @@ let type = with types; nullOr str; default = null; example = "/path/to/fullchain.pem"; - description = "Path to TLS certificate to use for connections to ${manref "public-inbox-${proto}d" 1}."; + description = lib.mdDoc "Path to TLS certificate to use for connections to {manpage}`public-inbox-${proto}d(1)`."; }; key = mkOption { type = with types; nullOr str; default = null; example = "/path/to/key.pem"; - description = "Path to TLS key to use for connections to ${manref "public-inbox-${proto}d" 1}."; + description = lib.mdDoc "Path to TLS key to use for connections to {manpage}`public-inbox-${proto}d(1)`."; }; }; @@ -198,15 +196,15 @@ in options.watch = mkOption { type = with types; listOf str; default = []; - description = "Paths for ${manref "public-inbox-watch" 1} to monitor for new mail."; + description = lib.mdDoc "Paths for {manpage}`public-inbox-watch(1)` to monitor for new mail."; example = [ "maildir:/path/to/test.example.com.git" ]; }; options.watchheader = mkOption { type = with types; nullOr str; default = null; example = "List-Id:"; - description = '' - If specified, ${manref "public-inbox-watch" 1} will only process + description = lib.mdDoc '' + If specified, {manpage}`public-inbox-watch(1)` will only process mail containing a matching header. ''; }; @@ -253,7 +251,7 @@ in args = mkOption { type = with types; listOf str; default = []; - description = "Command-line arguments to pass to ${manref "public-inbox-mda" 1}."; + description = lib.mdDoc "Command-line arguments to pass to {manpage}`public-inbox-mda(1)`."; }; }; postfix.enable = mkEnableOption "the integration into Postfix"; @@ -302,16 +300,16 @@ in options.publicinboxmda.spamcheck = mkOption { type = with types; enum [ "spamc" "none" ]; default = "none"; - description = '' - If set to spamc, ${manref "public-inbox-watch" 1} will filter spam + description = lib.mdDoc '' + If set to spamc, {manpage}`public-inbox-watch(1)` will filter spam using SpamAssassin. ''; }; options.publicinboxwatch.spamcheck = mkOption { type = with types; enum [ "spamc" "none" ]; default = "none"; - description = '' - If set to spamc, ${manref "public-inbox-watch" 1} will filter spam + description = lib.mdDoc '' + If set to spamc, {manpage}`public-inbox-watch(1)` will filter spam using SpamAssassin. ''; }; diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index ef20347ee245..aac0dac8a080 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -47,7 +47,7 @@ in $highlight_bin = "${pkgs.highlight}/bin/highlight"; ${cfg.extraConfig} ''; - defaultText = literalDocBook "generated config file"; + defaultText = literalMD "generated config file"; type = types.path; readOnly = true; internal = true; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2738d2ee6cd0..965da197f30f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -430,13 +430,14 @@ in }; config = { from = mkDefault { type = "indirect"; id = name; }; - to = mkIf (config.flake != null) (mkDefault + to = mkIf (config.flake != null) (mkDefault ( { type = "path"; path = config.flake.outPath; } // filterAttrs - (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") - config.flake); + (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake + )); }; } )); diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index cb41bbb54b27..033a4327ca96 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -134,6 +134,7 @@ in ExecStart = "${cfg.package}/bin/plexmediaserver"; KillSignal = "SIGQUIT"; + PIDFile = "${cfg.dataDir}/Plex Media Server/plexmediaserver.pid"; Restart = "on-failure"; }; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 8b6704c1be77..5af48af740f4 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -401,7 +401,7 @@ in config = mkOption { internal = true; default = pkgs.writeText "rippled.conf" rippledCfg; - defaultText = literalDocBook "generated config file"; + defaultText = literalMD "generated config file"; }; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index ada66fe24646..7c03c188356e 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -99,14 +99,14 @@ let mkDefOpt = type: defaultStr: description: mkOpt type (description + '' - Defaults to ${defaultStr} in prometheus - when set to null. + Defaults to ````${defaultStr}```` in prometheus + when set to `null`. ''); mkOpt = type: description: mkOption { type = types.nullOr type; default = null; - inherit description; + description = lib.mdDoc description; }; mkSdConfigModule = extraOptions: types.submodule { @@ -288,7 +288,7 @@ let If honor_labels is set to "false", label conflicts are resolved by renaming conflicting labels in the scraped data - to "exported_<original-label>" (for example + to "exported_\" (for example "exported_instance", "exported_job") and then attaching server-side labels. This is useful for use cases such as federation, where all labels specified in the target should @@ -299,10 +299,10 @@ let honor_timestamps controls whether Prometheus respects the timestamps present in scraped data. - If honor_timestamps is set to true, the timestamps of the metrics exposed + If honor_timestamps is set to `true`, the timestamps of the metrics exposed by the target will be used. - If honor_timestamps is set to false, the timestamps of the metrics exposed + If honor_timestamps is set to `false`, the timestamps of the metrics exposed by the target will be ignored. ''; @@ -323,13 +323,13 @@ let bearer_token = mkOpt types.str '' Sets the `Authorization` header on every scrape request with the configured bearer token. It is mutually exclusive with - . + {option}`bearer_token_file`. ''; bearer_token_file = mkOpt types.str '' Sets the `Authorization` header on every scrape request with the bearer token read from the configured file. It is mutually - exclusive with . + exclusive with {option}`bearer_token`. ''; tls_config = mkOpt promTypes.tls_config '' @@ -379,7 +379,7 @@ let gce_sd_configs = mkOpt (types.listOf promTypes.gce_sd_config) '' List of Google Compute Engine service discovery configurations. - See the relevant Prometheus configuration docs + See [the relevant Prometheus configuration docs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#gce_sd_config) for more detail. ''; @@ -591,7 +591,7 @@ let allow_stale = mkOpt types.bool '' Allow stale Consul results - (see ). + (see ). Will reduce load on Consul. ''; @@ -632,16 +632,16 @@ let options = { name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of the filter. The available filters are listed in the upstream documentation: - Services: - Tasks: - Nodes: + Services: + Tasks: + Nodes: ''; }; values = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Value for the filter. ''; }; @@ -707,12 +707,12 @@ let access_key = mkOpt types.str '' The AWS API key id. If blank, the environment variable - AWS_ACCESS_KEY_ID is used. + `AWS_ACCESS_KEY_ID` is used. ''; secret_key = mkOpt types.str '' The AWS API key secret. If blank, the environment variable - AWS_SECRET_ACCESS_KEY is used. + `AWS_SECRET_ACCESS_KEY` is used. ''; profile = mkOpt types.str '' @@ -738,8 +738,8 @@ let options = { name = mkOption { type = types.str; - description = '' - See this list + description = lib.mdDoc '' + See [this list](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html) for the available filters. ''; }; @@ -747,7 +747,7 @@ let values = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Value of the filter. ''; }; @@ -806,7 +806,7 @@ let filter = mkOpt types.str '' Filter can be used optionally to filter the instance list by other criteria Syntax of this filter string is described here in the filter - query parameter section: . + query parameter section: . ''; refresh_interval = mkDefOpt types.str "60s" '' @@ -822,7 +822,7 @@ let The tag separator used to separate concatenated GCE instance network tags. See the GCP documentation on network tags for more information: - + ''; }; }; @@ -917,7 +917,7 @@ let options = { role = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Selector role ''; }; @@ -976,11 +976,11 @@ let ''; access_key = mkOpt types.str '' - The AWS API keys. If blank, the environment variable AWS_ACCESS_KEY_ID is used. + The AWS API keys. If blank, the environment variable `AWS_ACCESS_KEY_ID` is used. ''; secret_key = mkOpt types.str '' - The AWS API keys. If blank, the environment variable AWS_SECRET_ACCESS_KEY is used. + The AWS API keys. If blank, the environment variable `AWS_SECRET_ACCESS_KEY` is used. ''; profile = mkOpt types.str '' @@ -1030,14 +1030,14 @@ let auth_token = mkOpt types.str '' Optional authentication information for token-based authentication: - - It is mutually exclusive with auth_token_file and other authentication mechanisms. + + It is mutually exclusive with `auth_token_file` and other authentication mechanisms. ''; auth_token_file = mkOpt types.str '' Optional authentication information for token-based authentication: - - It is mutually exclusive with auth_token and other authentication mechanisms. + + It is mutually exclusive with `auth_token` and other authentication mechanisms. ''; }; @@ -1299,7 +1299,7 @@ let }; groups = mkOpt (types.listOf types.str) '' - A list of groups for which targets are retrieved, only supported when targeting the container role. + A list of groups for which targets are retrieved, only supported when targeting the `container` role. If omitted all containers owned by the requesting account are scraped. ''; diff --git a/nixos/modules/services/monitoring/prometheus/sachet.nix b/nixos/modules/services/monitoring/prometheus/sachet.nix new file mode 100644 index 000000000000..f40229df8f1e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/sachet.nix @@ -0,0 +1,88 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.sachet; + configFile = pkgs.writeText "sachet.yml" (builtins.toJSON cfg.configuration); +in +{ + options = { + services.prometheus.sachet = { + enable = mkEnableOption "Sachet, an SMS alerting tool for the Prometheus Alertmanager"; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = null; + example = literalExample '' + { + providers = { + twilio = { + # environment variables gets expanded at runtime + account_sid = "$TWILIO_ACCOUNT"; + auth_token = "$TWILIO_TOKEN"; + }; + }; + templates = [ ./some-template.tmpl ]; + receivers = [{ + name = "pager"; + provider = "twilio"; + to = [ "+33123456789" ]; + text = "{{ template \"message\" . }}"; + }]; + } + ''; + description = '' + Sachet's configuration as a nix attribute set. + ''; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = '' + The address Sachet will listen to. + ''; + }; + + port = mkOption { + type = types.port; + default = 9876; + description = '' + The port Sachet will listen to. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + assertions = singleton { + assertion = cfg.configuration != null; + message = "Cannot enable Sachet without a configuration."; + }; + + systemd.services.sachet = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + script = '' + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /tmp/sachet.yaml + exec ${pkgs.prometheus-sachet}/bin/sachet -config /tmp/sachet.yaml -listen-address ${cfg.address}:${builtins.toString cfg.port} + ''; + + serviceConfig = { + Restart = "always"; + + ProtectSystem = "strict"; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + + DynamicUser = true; + PrivateTmp = true; + WorkingDirectory = "/tmp/"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index c7404241fbf5..a805656214be 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -8,7 +8,7 @@ let nullOpt = type: description: mkOption { type = types.nullOr type; default = null; - inherit description; + description = lib.mdDoc description; }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; @@ -18,8 +18,8 @@ let mkParamDef = type: default: description: mkParam type (description + '' - Defaults to ${toString default} in Thanos - when set to null. + Defaults to `${toString default}` in Thanos + when set to `null`. ''); mkParam = type: description: { @@ -32,7 +32,7 @@ let option = mkOption { type = types.bool; default = false; - inherit description; + description = lib.mdDoc description; }; }; @@ -41,7 +41,7 @@ let option = mkOption { type = types.listOf types.str; default = []; - inherit description; + description = lib.mdDoc description; }; }; @@ -50,7 +50,7 @@ let option = mkOption { type = types.attrsOf types.str; default = {}; - inherit description; + description = lib.mdDoc description; }; }; @@ -59,7 +59,7 @@ let option = mkOption { type = types.str; inherit default; - inherit description; + description = lib.mdDoc description; }; }; @@ -83,8 +83,8 @@ let mkArgumentsOption = cmd: mkOption { type = types.listOf types.str; default = argumentsOf cmd; - defaultText = literalDocBook '' - calculated from config.services.thanos.${cmd} + defaultText = literalMD '' + calculated from `config.services.thanos.${cmd}` ''; description = lib.mdDoc '' Arguments to the `thanos ${cmd}` command. @@ -141,13 +141,13 @@ let option = nullOpt types.attrs '' Tracing configuration. - When not null the attribute set gets converted to + When not `null` the attribute set gets converted to a YAML file and stored in the Nix store. The option - will default to its path. + {option}`tracing.config-file` will default to its path. - If is set this option has no effect. + If {option}`tracing.config-file` is set this option has no effect. - See format details: + See format details: ''; }; }; @@ -155,11 +155,11 @@ let common = cfg: params.log // params.tracing cfg // { http-address = mkParamDef types.str "0.0.0.0:10902" '' - Listen host:port for HTTP endpoints. + Listen `host:port` for HTTP endpoints. ''; grpc-address = mkParamDef types.str "0.0.0.0:10901" '' - Listen ip:port address for gRPC endpoints (StoreAPI). + Listen `ip:port` address for gRPC endpoints (StoreAPI). Make sure this address is routable from other components. ''; @@ -206,13 +206,13 @@ let option = nullOpt types.attrs '' Object store configuration. - When not null the attribute set gets converted to + When not `null` the attribute set gets converted to a YAML file and stored in the Nix store. The option - will default to its path. + {option}`objstore.config-file` will default to its path. - If is set this option has no effect. + If {option}`objstore.config-file` is set this option has no effect. - See format details: + See format details: ''; }; }; @@ -254,7 +254,7 @@ let store = params.common cfg.store // params.objstore cfg.store // { stateDir = mkStateDirParam "data-dir" "thanos-store" '' - Data directory relative to /var/lib + Data directory relative to `/var/lib` in which to cache remote blocks. ''; @@ -269,7 +269,7 @@ let store.grpc.series-sample-limit = mkParamDef types.int 0 '' Maximum amount of samples returned via a single Series call. - 0 means no limit. + `0` means no limit. NOTE: for efficiency we take 120 as the number of samples in chunk (it cannot be bigger than that), so the actual number of samples might be @@ -327,14 +327,14 @@ let grpc-client-server-name = mkParam types.str '' Server name to verify the hostname on the returned gRPC certificates. - See + See ''; web.route-prefix = mkParam types.str '' Prefix for API and UI endpoints. This allows thanos UI to be served on a sub-path. This option is - analogous to of Promethus. + analogous to {option}`web.route-prefix` of Promethus. ''; web.external-prefix = mkParam types.str '' @@ -342,7 +342,7 @@ let interface. Actual endpoints are still served on / or the - . This allows thanos UI to be served + {option}`web.route-prefix`. This allows thanos UI to be served behind a reverse proxy that strips a URL sub-path. ''; @@ -351,15 +351,15 @@ let redirects. This option is ignored if the option - web.external-prefix is set. + `web.external-prefix` is set. Security risk: enable this option only if a reverse proxy in front of thanos is resetting the header. - The setting web.prefix-header="X-Forwarded-Prefix" + The setting `web.prefix-header="X-Forwarded-Prefix"` can be useful, for example, if Thanos UI is served via Traefik reverse - proxy with PathPrefixStrip option enabled, which - sends the stripped prefix value in X-Forwarded-Prefix + proxy with `PathPrefixStrip` option enabled, which + sends the stripped prefix value in `X-Forwarded-Prefix` header. This allows thanos UI to be served on a sub-path. ''; @@ -376,7 +376,7 @@ let deduplicated. Still you will be able to query without deduplication using - dedup=false parameter. + `dedup=false` parameter. ''; selector-labels = mkAttrsParam "selector-label" '' @@ -386,8 +386,8 @@ let store.addresses = mkListParam "store" '' Addresses of statically configured store API servers. - The scheme may be prefixed with dns+ or - dnssrv+ to detect store API servers through + The scheme may be prefixed with `dns+` or + `dnssrv+` to detect store API servers through respective DNS lookups. ''; @@ -411,12 +411,12 @@ let query.auto-downsampling = mkFlagParam '' Enable automatic adjustment (step / 5) to what source of data should be used in store gateways if no - max_source_resolution param is specified. + `max_source_resolution` param is specified. ''; query.partial-response = mkFlagParam '' Enable partial response for queries if no - partial_response param is specified. + `partial_response` param is specified. ''; query.default-evaluation-interval = mkParamDef types.str "1m" '' @@ -426,7 +426,7 @@ let store.response-timeout = mkParamDef types.str "0ms" '' If a Store doesn't send any data in this specified duration then a Store will be ignored and partial data will be returned if it's - enabled. 0 disables timeout. + enabled. `0` disables timeout. ''; }; @@ -440,7 +440,7 @@ let ''; stateDir = mkStateDirParam "data-dir" "thanos-rule" '' - Data directory relative to /var/lib. + Data directory relative to `/var/lib`. ''; rule-files = mkListParam "rule-file" '' @@ -464,9 +464,9 @@ let Ruler claims success if push to at least one alertmanager from discovered succeeds. The scheme may be prefixed with - dns+ or dnssrv+ to detect + `dns+` or `dnssrv+` to detect Alertmanager IPs through respective DNS lookups. The port defaults to - 9093 or the SRV record's value. The URL path is + `9093` or the SRV record's value. The URL path is used as a prefix for the regular Alertmanager API path. ''; @@ -491,7 +491,7 @@ let This allows thanos UI to be served on a sub-path. - This option is analogous to --web.route-prefix of Promethus. + This option is analogous to `--web.route-prefix` of Promethus. ''; web.external-prefix = mkParam types.str '' @@ -499,7 +499,7 @@ let interface. Actual endpoints are still served on / or the - . This allows thanos UI to be served + {option}`web.route-prefix`. This allows thanos UI to be served behind a reverse proxy that strips a URL sub-path. ''; @@ -508,23 +508,23 @@ let redirects. This option is ignored if the option - is set. + {option}`web.external-prefix` is set. Security risk: enable this option only if a reverse proxy in front of thanos is resetting the header. - The header X-Forwarded-Prefix can be useful, for + The header `X-Forwarded-Prefix` can be useful, for example, if Thanos UI is served via Traefik reverse proxy with - PathPrefixStrip option enabled, which sends the - stripped prefix value in X-Forwarded-Prefix + `PathPrefixStrip` option enabled, which sends the + stripped prefix value in `X-Forwarded-Prefix` header. This allows thanos UI to be served on a sub-path. ''; query.addresses = mkListParam "query" '' Addresses of statically configured query API servers. - The scheme may be prefixed with dns+ or - dnssrv+ to detect query API servers through + The scheme may be prefixed with `dns+` or + `dnssrv+` to detect query API servers through respective DNS lookups. ''; @@ -545,11 +545,11 @@ let compact = params.log // params.tracing cfg.compact // params.objstore cfg.compact // { http-address = mkParamDef types.str "0.0.0.0:10902" '' - Listen host:port for HTTP endpoints. + Listen `host:port` for HTTP endpoints. ''; stateDir = mkStateDirParam "data-dir" "thanos-compact" '' - Data directory relative to /var/lib + Data directory relative to `/var/lib` in which to cache blocks and process compactions. ''; @@ -562,28 +562,28 @@ let retention.resolution-raw = mkParamDef types.str "0d" '' How long to retain raw samples in bucket. - 0d - disables this retention + `0d` - disables this retention ''; retention.resolution-5m = mkParamDef types.str "0d" '' How long to retain samples of resolution 1 (5 minutes) in bucket. - 0d - disables this retention + `0d` - disables this retention ''; retention.resolution-1h = mkParamDef types.str "0d" '' How long to retain samples of resolution 2 (1 hour) in bucket. - 0d - disables this retention + `0d` - disables this retention ''; startAt = { toArgs = _opt: startAt: flagToArgs "wait" (startAt == null); option = nullOpt types.str '' - When this option is set to a systemd.time + When this option is set to a `systemd.time` specification the Thanos compactor will run at the specified period. - When this option is null the Thanos compactor service + When this option is `null` the Thanos compactor service will run continuously. So it will not exit after all compactions have been processed but wait for new work. ''; @@ -609,7 +609,7 @@ let downsample = params.log // params.tracing cfg.downsample // params.objstore cfg.downsample // { stateDir = mkStateDirParam "data-dir" "thanos-downsample" '' - Data directory relative to /var/lib + Data directory relative to `/var/lib` in which to cache blocks and process downsamplings. ''; @@ -622,7 +622,7 @@ let ''; stateDir = mkStateDirParam "tsdb.path" "thanos-receive" '' - Data directory relative to /var/lib of TSDB. + Data directory relative to `/var/lib` of TSDB. ''; labels = mkAttrsParam "labels" '' @@ -635,7 +635,7 @@ let tsdb.retention = mkParamDef types.str "15d" '' How long to retain raw samples on local storage. - 0d - disables this retention + `0d` - disables this retention ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix index ff7934101039..60e9a91bc176 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -56,7 +56,7 @@ in ''} ${pkgs.remarshal}/bin/json2toml < config.json > $out ''; - defaultText = literalDocBook "TOML file generated from "; + defaultText = literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`"; }; }; diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix index ea96a736fecf..09151eb0b544 100644 --- a/nixos/modules/services/networking/ferm.nix +++ b/nixos/modules/services/networking/ferm.nix @@ -30,7 +30,7 @@ in { config = mkOption { description = lib.mdDoc "Verbatim ferm.conf configuration."; default = ""; - defaultText = literalDocBook "empty firewall, allows any traffic"; + defaultText = literalMD "empty firewall, allows any traffic"; type = types.lines; }; package = mkOption { diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 48cb83e344ec..7f42df0b08ff 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -417,7 +417,7 @@ in checkReversePath = mkOption { type = types.either types.bool (types.enum ["strict" "loose"]); default = kernelHasRPFilter; - defaultText = literalDocBook "true if supported by the chosen kernel"; + defaultText = literalMD "`true` if supported by the chosen kernel"; example = "loose"; description = lib.mdDoc '' diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 4e7d5ce59ce8..008528ad35bb 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -88,7 +88,7 @@ in name = "nftables-rules"; text = cfg.ruleset; }; - defaultText = literalDocBook ''a file with the contents of ''; + defaultText = literalMD ''a file with the contents of {option}`networking.nftables.ruleset`''; description = lib.mdDoc '' The ruleset file to be used with nftables. Should be in a format that diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 238479864f88..2a97539032d5 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -195,7 +195,10 @@ in ExecStart = "${cfg.package}/bin/searx-run"; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; - environment.SEARX_SETTINGS_PATH = cfg.settingsFile; + environment = { + SEARX_SETTINGS_PATH = cfg.settingsFile; + SEARXNG_SETTINGS_PATH = cfg.settingsFile; + }; }; systemd.services.uwsgi = mkIf (cfg.runInUwsgi) diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index d5a8daf98ec6..8245b25719e4 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -57,12 +57,12 @@ rec { documentDefault = description : strongswanDefault : if strongswanDefault == null - then description - else description + '' + then mdDoc description + else mdDoc (description + '' - StrongSwan default: - ''; + StrongSwan default: ````${builtins.toJSON strongswanDefault}```` + ''); single = f: name: value: { ${name} = f value; }; @@ -121,7 +121,7 @@ rec { option = mkOption { type = types.attrsOf option; default = {}; - inherit description; + description = mdDoc description; }; render = single (attrs: (paramsToRenderedStrings attrs @@ -139,7 +139,7 @@ rec { option = mkOption { type = types.attrsOf option; default = {}; - inherit description; + description = mdDoc description; }; render = prefix: attrs: let prefixedAttrs = mapAttrs' (name: nameValuePair "${prefix}-${name}") attrs; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 737d0331f195..84ac4fef26ef 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -16,14 +16,14 @@ let Absolute path to the certificate to load. Passed as-is to the daemon, so it must be readable by it. - Configure either this or , but not both, in one section. + Configure either this or {option}`handle`, but not both, in one section. ''; handle = mkOptionalHexParam '' Hex-encoded CKA_ID or handle of the certificate on a token or TPM, respectively. - Configure either this or , but not both, in one section. + Configure either this or {option}`file`, but not both, in one section. ''; slot = mkOptionalIntParam '' @@ -39,11 +39,11 @@ in { cacert = mkOptionalStrParam '' The certificates may use a relative path from the swanctl - x509ca directory or an absolute path. + `x509ca` directory or an absolute path. - Configure one of , - , or - per section. + Configure one of {option}`cacert`, + {option}`file`, or + {option}`handle` per section. ''; cert_uri_base = mkOptionalStrParam '' @@ -71,12 +71,11 @@ in { version = mkIntParam 0 '' IKE major version to use for connection. - - 1 uses IKEv1 aka ISAKMP, - 2 uses IKEv2. - A connection using the default of 0 accepts both IKEv1 and IKEv2 as - responder, and initiates the connection actively with IKEv2. - + + - 1 uses IKEv1 aka ISAKMP, + - 2 uses IKEv2. + - A connection using the default of 0 accepts both IKEv1 and IKEv2 as + responder, and initiates the connection actively with IKEv2. ''; local_addrs = mkCommaSepListParam [] '' @@ -107,9 +106,9 @@ in { local_port = mkIntParam 500 '' Local UDP port for IKE communication. By default the port of the socket - backend is used, which is usually 500. If port - 500 is used, automatic IKE port floating to port - 4500 is used to work around NAT issues. + backend is used, which is usually `500`. If port + `500` is used, automatic IKE port floating to port + `4500` is used to work around NAT issues. Using a non-default local IKE port requires support from the socket backend in use (socket-dynamic). @@ -117,8 +116,8 @@ in { remote_port = mkIntParam 500 '' Remote UDP port for IKE communication. If the default of port - 500 is used, automatic IKE port floating to port - 4500 is used to work around NAT issues. + `500` is used, automatic IKE port floating to port + `4500` is used to work around NAT issues. ''; proposals = mkCommaSepListParam ["default"] '' @@ -134,15 +133,15 @@ in { combinations in IKEv1. Algorithm keywords get separated using dashes. Multiple proposals may be - specified in a list. The special value default forms a + specified in a list. The special value `default` forms a default proposal of supported algorithms considered safe, and is usually a good choice for interoperability. ''; vips = mkCommaSepListParam [] '' List of virtual IPs to request in IKEv2 configuration payloads or IKEv1 - Mode Config. The wildcard addresses 0.0.0.0 and - :: request an arbitrary address, specific addresses may + Mode Config. The wildcard addresses `0.0.0.0` and + `::` request an arbitrary address, specific addresses may be defined. The responder may return a different address, though, or none at all. ''; @@ -207,21 +206,20 @@ in { fragmentation = mkEnumParam ["yes" "accept" "force" "no"] "yes" '' Use IKE fragmentation (proprietary IKEv1 extension or RFC 7383 IKEv2 - fragmentation). Acceptable values are yes (the default - since 5.5.1), accept (since versions:5.5.3), - force and no. - - If set to yes, and the peer - supports it, oversized IKE messages will be sent in fragments. - If set to - accept, support for fragmentation is announced to the peer but the daemon - does not send its own messages in fragments. - If set to force (only - supported for IKEv1) the initial IKE message will already be fragmented if - required. - Finally, setting the option to no will disable announcing - support for this feature. - + fragmentation). Acceptable values are `yes` (the default + since 5.5.1), `accept` (since versions:5.5.3), + `force` and `no`. + + - If set to `yes`, and the peer + supports it, oversized IKE messages will be sent in fragments. + - If set to + `accept`, support for fragmentation is announced to the peer but the daemon + does not send its own messages in fragments. + - If set to `force` (only + supported for IKEv1) the initial IKE message will already be fragmented if + required. + - Finally, setting the option to `no` will disable announcing + support for this feature. Note that fragmented IKE messages sent by a peer are always processed irrespective of the value of this option (even when set to no). @@ -229,17 +227,17 @@ in { childless = mkEnumParam [ "allow" "force" "never" ] "allow" '' Use childless IKE_SA initiation (RFC 6023) for IKEv2. Acceptable values - are allow (the default), force and - never. If set to allow, responders + are `allow` (the default), `force` and + `never`. If set to `allow`, responders will accept childless IKE_SAs (as indicated via notify in the IKE_SA_INIT response) while initiators continue to create regular IKE_SAs with the first CHILD_SA created during IKE_AUTH, unless the IKE_SA is initiated explicitly without any children (which will fail if the responder does not support or has disabled this extension). If set to - force, only childless initiation is accepted and the + `force`, only childless initiation is accepted and the first CHILD_SA is created with a separate CREATE_CHILD_SA exchange (e.g. to use an independent DH exchange for all CHILD_SAs). Finally, - setting the option to never disables support for + setting the option to `never` disables support for childless IKE_SAs as responder. ''; @@ -254,14 +252,13 @@ in { send_cert = mkEnumParam ["always" "never" "ifasked" ] "ifasked" '' Send certificate payloads when using certificate authentication. - - With the default of ifasked the daemon sends - certificate payloads only if certificate requests have been received. - never disables sending of certificate payloads - altogether, - always causes certificate payloads to be sent - unconditionally whenever certificate authentication is used. - + + - With the default of `ifasked` the daemon sends + certificate payloads only if certificate requests have been received. + - `never` disables sending of certificate payloads + altogether, + - `always` causes certificate payloads to be sent + unconditionally whenever certificate authentication is used. ''; ppk_id = mkOptionalStrParam '' @@ -275,9 +272,9 @@ in { keyingtries = mkIntParam 1 '' Number of retransmission sequences to perform during initial connect. Instead of giving up initiation after the first retransmission - sequence with the default value of 1, additional + sequence with the default value of `1`, additional sequences may be started according to the configured value. A value of - 0 initiates a new sequence until the connection + `0` initiates a new sequence until the connection establishes or fails with a permanent error. ''; @@ -285,24 +282,15 @@ in { Connection uniqueness policy to enforce. To avoid multiple connections from the same user, a uniqueness policy can be enforced. - - - The value never does never enforce such a policy, even - if a peer included INITIAL_CONTACT notification messages, - - - whereas no replaces existing connections for the same - identity if a new one has the INITIAL_CONTACT notify. - - - keep rejects new connection attempts if the same user - already has an active connection, - - - replace deletes any existing connection if a new one - for the same user gets established. - - + - The value `never` does never enforce such a policy, even + if a peer included INITIAL_CONTACT notification messages, + - whereas `no` replaces existing connections for the same + identity if a new one has the INITIAL_CONTACT notify. + - `keep` rejects new connection attempts if the same user + already has an active connection, + - `replace` deletes any existing connection if a new one + for the same user gets established. + To compare connections for uniqueness, the remote IKE identity is used. If EAP or XAuth authentication is involved, the EAP-Identity or XAuth username is used to enforce the uniqueness policy instead. @@ -310,7 +298,7 @@ in { On initiators this setting specifies whether an INITIAL_CONTACT notify is sent during IKE_AUTH if no existing connection is found with the remote peer (determined by the identities of the first authentication - round). Unless set to never the client will send a notify. + round). Unless set to `never` the client will send a notify. ''; reauth_time = mkDurationParam "0s" '' @@ -347,8 +335,8 @@ in { In contrast to CHILD_SA rekeying, over_time is relative in time to the rekey_time and reauth_time values, as it applies to both. - The default is 10% of the longer of and - . + The default is 10% of the longer of {option}`rekey_time` and + {option}`reauth_time`. ''; rand_time = mkOptionalDurationParam '' @@ -357,7 +345,7 @@ in { procedure simultaneously, a random time gets subtracted from the rekey/reauth times. - The default is equal to the configured . + The default is equal to the configured {option}`over_time`. ''; pools = mkCommaSepListParam [] '' @@ -409,7 +397,7 @@ in { certs = mkCommaSepListParam [] '' List of certificate candidates to use for authentication. The certificates may use a relative path from the - swanctl x509 directory or an absolute path. + swanctl `x509` directory or an absolute path. The certificate used for authentication is selected based on the received certificate request payloads. If no appropriate CA can be @@ -425,7 +413,7 @@ in { pubkeys = mkCommaSepListParam [] '' List of raw public key candidates to use for authentication. The public keys may use a relative path from the swanctl - pubkey directory or an absolute path. + `pubkey` directory or an absolute path. Even though multiple local public keys could be defined in principle, only the first public key in the list is used for authentication. @@ -433,59 +421,44 @@ in { auth = mkStrParam "pubkey" '' Authentication to perform locally. - - - The default pubkey uses public key authentication - using a private key associated to a usable certificate. - - - psk uses pre-shared key authentication. - - - The IKEv1 specific xauth is used for XAuth or Hybrid - authentication, - - - while the IKEv2 specific eap keyword defines EAP - authentication. - - - For xauth, a specific backend name may be appended, - separated by a dash. The appropriate xauth backend is - selected to perform the XAuth exchange. For traditional XAuth, the - xauth method is usually defined in the second - authentication round following an initial pubkey (or - psk) round. Using xauth in the - first round performs Hybrid Mode client authentication. - - - For eap, a specific EAP method name may be appended, separated by a - dash. An EAP module implementing the appropriate method is selected to - perform the EAP conversation. - - - Since 5.4.0, if both peers support RFC 7427 ("Signature Authentication - in IKEv2") specific hash algorithms to be used during IKEv2 - authentication may be configured. To do so use ike: - followed by a trust chain signature scheme constraint (see description - of the section's - keyword). For example, with ike:pubkey-sha384-sha256 - a public key signature scheme with either SHA-384 or SHA-256 would get - used for authentication, in that order and depending on the hash - algorithms supported by the peer. If no specific hash algorithms are - configured, the default is to prefer an algorithm that matches or - exceeds the strength of the signature key. If no constraints with - ike: prefix are configured any signature scheme - constraint (without ike: prefix) will also apply to - IKEv2 authentication, unless this is disabled in - strongswan.conf. To use RSASSA-PSS signatures use - rsa/pss instead of pubkey or - rsa as in e.g. - ike:rsa/pss-sha256. If pubkey or - rsa constraints are configured RSASSA-PSS signatures - will only be used if enabled in strongswan.conf(5). - - + + - The default `pubkey` uses public key authentication + using a private key associated to a usable certificate. + - `psk` uses pre-shared key authentication. + - The IKEv1 specific `xauth` is used for XAuth or Hybrid + authentication, + - while the IKEv2 specific `eap` keyword defines EAP + authentication. + - For `xauth`, a specific backend name may be appended, + separated by a dash. The appropriate `xauth` backend is + selected to perform the XAuth exchange. For traditional XAuth, the + `xauth` method is usually defined in the second + authentication round following an initial `pubkey` (or + `psk`) round. Using `xauth` in the + first round performs Hybrid Mode client authentication. + - For `eap`, a specific EAP method name may be appended, separated by a + dash. An EAP module implementing the appropriate method is selected to + perform the EAP conversation. + - Since 5.4.0, if both peers support RFC 7427 ("Signature Authentication + in IKEv2") specific hash algorithms to be used during IKEv2 + authentication may be configured. To do so use `ike:` + followed by a trust chain signature scheme constraint (see description + of the {option}`remote` section's {option}`auth` + keyword). For example, with `ike:pubkey-sha384-sha256` + a public key signature scheme with either SHA-384 or SHA-256 would get + used for authentication, in that order and depending on the hash + algorithms supported by the peer. If no specific hash algorithms are + configured, the default is to prefer an algorithm that matches or + exceeds the strength of the signature key. If no constraints with + `ike:` prefix are configured any signature scheme + constraint (without `ike:` prefix) will also apply to + IKEv2 authentication, unless this is disabled in + `strongswan.conf`. To use RSASSA-PSS signatures use + `rsa/pss` instead of `pubkey` or + `rsa` as in e.g. + `ike:rsa/pss-sha256`. If `pubkey` or + `rsa` constraints are configured RSASSA-PSS signatures + will only be used if enabled in `strongswan.conf`(5). ''; id = mkOptionalStrParam '' @@ -519,7 +492,7 @@ in { peer. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - Each round is defined in a section having local as + Each round is defined in a section having `local` as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. ''; @@ -540,7 +513,7 @@ in { eap_id = mkOptionalStrParam '' Identity to use as peer identity during EAP authentication. If set to - %any the EAP-Identity method will be used to ask the + `%any` the EAP-Identity method will be used to ask the client for an EAP identity. ''; @@ -559,7 +532,7 @@ in { certs = mkCommaSepListParam [] '' List of certificates to accept for authentication. The certificates may - use a relative path from the swanctl x509 directory + use a relative path from the swanctl `x509` directory or an absolute path. ''; @@ -573,7 +546,7 @@ in { Identity in CA certificate to accept for authentication. The specified identity must be contained in one (intermediate) CA of the remote peer trustchain, either as subject or as subjectAltName. This has the same - effect as specifying cacerts to force clients under + effect as specifying `cacerts` to force clients under a CA to specific connections; it does not require the CA certificate to be available locally, and can be received from the peer during the IKE exchange. @@ -582,7 +555,7 @@ in { cacerts = mkCommaSepListParam [] '' List of CA certificates to accept for authentication. The certificates may use a relative path from the - swanctl x509ca directory or an absolute path. + swanctl `x509ca` directory or an absolute path. ''; cacert = mkPostfixedAttrsOfParams certParams '' @@ -594,57 +567,50 @@ in { pubkeys = mkCommaSepListParam [] '' List of raw public keys to accept for authentication. The public keys may use a relative path from the swanctl - pubkey directory or an absolute path. + `pubkey` directory or an absolute path. ''; revocation = mkEnumParam ["strict" "ifuri" "relaxed"] "relaxed" '' Certificate revocation policy for CRL or OCSP revocation. - - - A strict revocation policy fails if no revocation information is - available, i.e. the certificate is not known to be unrevoked. - - - ifuri fails only if a CRL/OCSP URI is available, but certificate - revocation checking fails, i.e. there should be revocation information - available, but it could not be obtained. - - - The default revocation policy relaxed fails only if a certificate is - revoked, i.e. it is explicitly known that it is bad. - - + + - A `strict` revocation policy fails if no revocation information is + available, i.e. the certificate is not known to be unrevoked. + - `ifuri` fails only if a CRL/OCSP URI is available, but certificate + revocation checking fails, i.e. there should be revocation information + available, but it could not be obtained. + - The default revocation policy `relaxed` fails only if a certificate is + revoked, i.e. it is explicitly known that it is bad. ''; auth = mkStrParam "pubkey" '' - Authentication to expect from remote. See the - section's keyword description about the details of + Authentication to expect from remote. See the {option}`local` + section's {option}`auth` keyword description about the details of supported mechanisms. Since 5.4.0, to require a trustchain public key strength for the remote side, specify the key type followed by the minimum strength in bits (for - example ecdsa-384 or - rsa-2048-ecdsa-256). To limit the acceptable set of + example `ecdsa-384` or + `rsa-2048-ecdsa-256`). To limit the acceptable set of hashing algorithms for trustchain validation, append hash algorithms to pubkey or a key strength definition (for example - pubkey-sha256-sha512, - rsa-2048-sha256-sha384-sha512 or - rsa-2048-sha256-ecdsa-256-sha256-sha384). - Unless disabled in strongswan.conf, or explicit IKEv2 + `pubkey-sha256-sha512`, + `rsa-2048-sha256-sha384-sha512` or + `rsa-2048-sha256-ecdsa-256-sha256-sha384`). + Unless disabled in `strongswan.conf`, or explicit IKEv2 signature constraints are configured (refer to the description of the - section's keyword for + {option}`local` section's {option}`auth` keyword for details), such key types and hash algorithms are also applied as constraints against IKEv2 signature authentication schemes used by the remote side. To require RSASSA-PSS signatures use - rsa/pss instead of pubkey or - rsa as in e.g. rsa/pss-sha256. If - pubkey or rsa constraints are + `rsa/pss` instead of `pubkey` or + `rsa` as in e.g. `rsa/pss-sha256`. If + `pubkey` or `rsa` constraints are configured RSASSA-PSS signatures will only be accepted if enabled in - strongswan.conf(5). + `strongswan.conf`(5). To specify trust chain constraints for EAP-(T)TLS, append a colon to the EAP method, followed by the key type/size and hash algorithm as - discussed above (e.g. eap-tls:ecdsa-384-sha384). + discussed above (e.g. `eap-tls:ecdsa-384-sha384`). ''; } '' @@ -653,7 +619,7 @@ in { connection. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - Each round is defined in a section having remote as + Each round is defined in a section having `remote` as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. ''; @@ -673,7 +639,7 @@ in { combinations in IKEv1. Algorithm keywords get separated using dashes. Multiple proposals may be - specified in a list. The special value default forms + specified in a list. The special value `default` forms a default proposal of supported algorithms considered safe, and is usually a good choice for interoperability. By default no AH proposals are included, instead ESP is proposed. @@ -697,9 +663,9 @@ in { SA is established, but may later cause rekeying to fail. Extended Sequence Number support may be indicated with the - esn and noesn values, both may be + `esn` and `noesn` values, both may be included to indicate support for both modes. If omitted, - noesn is assumed. + `noesn` is assumed. In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one @@ -708,7 +674,7 @@ in { combinations in IKEv1. Algorithm keywords get separated using dashes. Multiple proposals may be - specified as a list. The special value default forms + specified as a list. The special value `default` forms a default proposal of supported algorithms considered safe, and is usually a good choice for interoperability. If no algorithms are specified for AH nor ESP, the default set of algorithms for ESP is @@ -726,7 +692,7 @@ in { local_ts = mkCommaSepListParam ["dynamic"] '' List of local traffic selectors to include in CHILD_SA. Each selector is a CIDR subnet definition, followed by an optional proto/port - selector. The special value dynamic may be used + selector. The special value `dynamic` may be used instead of a subnet definition, which gets replaced by the tunnel outer address or the virtual IP, if negotiated. This is the default. @@ -735,7 +701,7 @@ in { name may be specified. After the optional protocol restriction, an optional port restriction may be specified, separated by a slash. The port restriction may be numeric, a getservent(3) service name, or the - special value opaque for RFC 4301 OPAQUE + special value `opaque` for RFC 4301 OPAQUE selectors. Port ranges may be specified as well, none of the kernel backends currently support port ranges, though. @@ -752,31 +718,31 @@ in { remote_ts = mkCommaSepListParam ["dynamic"] '' List of remote selectors to include in CHILD_SA. See - for a description of the selector syntax. + {option}`local_ts` for a description of the selector syntax. ''; rekey_time = mkDurationParam "1h" '' Time to schedule CHILD_SA rekeying. CHILD_SA rekeying refreshes key material, optionally using a Diffie-Hellman exchange if a group is specified in the proposal. To avoid rekey collisions initiated by both - ends simultaneously, a value in the range of + ends simultaneously, a value in the range of {option}`rand_time` gets subtracted to form the effective soft lifetime. By default CHILD_SA rekeying is scheduled every hour, minus - . + {option}`rand_time`. ''; life_time = mkOptionalDurationParam '' Maximum lifetime before CHILD_SA gets closed. Usually this hard lifetime is never reached, because the CHILD_SA gets rekeyed before. If that fails for whatever reason, this limit closes the CHILD_SA. The default is 10% - more than the . + more than the {option}`rekey_time`. ''; rand_time = mkOptionalDurationParam '' Time range from which to choose a random value to subtract from - . The default is the difference between - and . + {option}`rekey_time`. The default is the difference between + {option}`life_time` and {option}`rekey_time`. ''; rekey_bytes = mkIntParam 0 '' @@ -785,7 +751,7 @@ in { exchange if a group is specified in the proposal. To avoid rekey collisions initiated by both ends simultaneously, a value - in the range of gets subtracted to form the + in the range of {option}`rand_bytes` gets subtracted to form the effective soft volume limit. Volume based CHILD_SA rekeying is disabled by default. @@ -795,13 +761,13 @@ in { Maximum bytes processed before CHILD_SA gets closed. Usually this hard volume limit is never reached, because the CHILD_SA gets rekeyed before. If that fails for whatever reason, this limit closes the - CHILD_SA. The default is 10% more than . + CHILD_SA. The default is 10% more than {option}`rekey_bytes`. ''; rand_bytes = mkOptionalIntParam '' Byte range from which to choose a random value to subtract from - . The default is the difference between - and . + {option}`rekey_bytes`. The default is the difference between + {option}`life_bytes` and {option}`rekey_bytes`. ''; rekey_packets = mkIntParam 0 '' @@ -810,7 +776,7 @@ in { exchange if a group is specified in the proposal. To avoid rekey collisions initiated by both ends simultaneously, a value - in the range of gets subtracted to form + in the range of {option}`rand_packets` gets subtracted to form the effective soft packet count limit. Packet count based CHILD_SA rekeying is disabled by default. @@ -822,13 +788,13 @@ in { rekeyed before. If that fails for whatever reason, this limit closes the CHILD_SA. - The default is 10% more than . + The default is 10% more than {option}`rekey_bytes`. ''; rand_packets = mkOptionalIntParam '' Packet range from which to choose a random value to subtract from - . The default is the difference between - and . + {option}`rekey_packets`. The default is the difference between + {option}`life_packets` and {option}`rekey_packets`. ''; updown = mkOptionalStrParam '' @@ -836,7 +802,7 @@ in { ''; hostaccess = mkYesNoParam no '' - Hostaccess variable to pass to updown script. + Hostaccess variable to pass to `updown` script. ''; mode = mkEnumParam [ "tunnel" @@ -847,33 +813,20 @@ in { "drop" ] "tunnel" '' IPsec Mode to establish CHILD_SA with. - - - tunnel negotiates the CHILD_SA in IPsec Tunnel Mode, - - - whereas transport uses IPsec Transport Mode. - - - transport_proxy signifying the special Mobile IPv6 - Transport Proxy Mode. - - - beet is the Bound End to End Tunnel mixture mode, - working with fixed inner addresses without the need to include them in - each packet. - - - Both transport and beet modes are - subject to mode negotiation; tunnel mode is - negotiated if the preferred mode is not available. - - - pass and drop are used to install - shunt policies which explicitly bypass the defined traffic from IPsec - processing or drop it, respectively. - - + + - `tunnel` negotiates the CHILD_SA in IPsec Tunnel Mode, + - whereas `transport` uses IPsec Transport Mode. + - `transport_proxy` signifying the special Mobile IPv6 + Transport Proxy Mode. + - `beet` is the Bound End to End Tunnel mixture mode, + working with fixed inner addresses without the need to include them in + each packet. + - Both `transport` and `beet` modes are + subject to mode negotiation; `tunnel` mode is + negotiated if the preferred mode is not available. + - `pass` and `drop` are used to install + shunt policies which explicitly bypass the defined traffic from IPsec + processing or drop it, respectively. ''; policies = mkYesNoParam yes '' @@ -932,18 +885,18 @@ in { set. This allows installing duplicate policies and enables Netfilter rules to select specific SAs/policies for incoming traffic. Note that inbound marks are only set on policies, by default, unless - is enabled. The special value - %unique sets a unique mark on each CHILD_SA instance, - beyond that the value %unique-dir assigns a different + {option}`mark_in_sa` is enabled. The special value + `%unique` sets a unique mark on each CHILD_SA instance, + beyond that the value `%unique-dir` assigns a different unique mark for each An additional mask may be appended to the mark, separated by - /. The default mask if omitted is - 0xffffffff. + `/`. The default mask if omitted is + `0xffffffff`. ''; mark_in_sa = mkYesNoParam no '' - Whether to set on the inbound SA. By default, + Whether to set {option}`mark_in` on the inbound SA. By default, the inbound mark is only set on the inbound policy. The tuple destination address, protocol and SPI is unique and the mark is not required to find the correct SA, allowing to mark traffic after decryption instead (where @@ -957,13 +910,13 @@ in { require marks on each packet to match a policy/SA having that option set. This allows installing duplicate policies and enables Netfilter rules to select specific policies/SAs for outgoing traffic. The special - value %unique sets a unique mark on each CHILD_SA - instance, beyond that the value %unique-dir assigns a + value `%unique` sets a unique mark on each CHILD_SA + instance, beyond that the value `%unique-dir` assigns a different unique mark for each CHILD_SA direction (in/out). An additional mask may be appended to the mark, separated by - /. The default mask if omitted is - 0xffffffff. + `/`. The default mask if omitted is + `0xffffffff`. ''; set_mark_in = mkStrParam "0/0x00000000" '' @@ -973,10 +926,10 @@ in { differently (e.g. via policy routing). An additional mask may be appended to the mark, separated by - /. The default mask if omitted is 0xffffffff. The - special value %same uses the value (but not the mask) - from as mark value, which can be fixed, - %unique or %unique-dir. + `/`. The default mask if omitted is 0xffffffff. The + special value `%same` uses the value (but not the mask) + from {option}`mark_in` as mark value, which can be fixed, + `%unique` or `%unique-dir`. Setting marks in XFRM input requires Linux 4.19 or higher. ''; @@ -987,10 +940,10 @@ in { traffic (e.g. via policy routing). An additional mask may be appended to the mark, separated by - /. The default mask if omitted is 0xffffffff. The - special value %same uses the value (but not the mask) - from as mark value, which can be fixed, - %unique_ or %unique-dir. + `/`. The default mask if omitted is 0xffffffff. The + special value `%same` uses the value (but not the mask) + from {option}`mark_out` as mark value, which can be fixed, + `%unique_` or `%unique-dir`. Setting marks in XFRM output is supported since Linux 4.14. Setting a mask requires at least Linux 4.19. @@ -999,18 +952,18 @@ in { if_id_in = mkStrParam "0" '' XFRM interface ID set on inbound policies/SA. This allows installing duplicate policies/SAs and associates them with an interface with the - same ID. The special value %unique sets a unique + same ID. The special value `%unique` sets a unique interface ID on each CHILD_SA instance, beyond that the value - %unique-dir assigns a different unique interface ID + `%unique-dir` assigns a different unique interface ID for each CHILD_SA direction (in/out). ''; if_id_out = mkStrParam "0" '' XFRM interface ID set on outbound policies/SA. This allows installing duplicate policies/SAs and associates them with an interface with the - same ID. The special value %unique sets a unique + same ID. The special value `%unique` sets a unique interface ID on each CHILD_SA instance, beyond that the value - %unique-dir assigns a different unique interface ID + `%unique-dir` assigns a different unique interface ID for each CHILD_SA direction (in/out). The daemon will not install routes for CHILD_SAs that have this option set. @@ -1020,23 +973,23 @@ in { Pads ESP packets with additional data to have a consistent ESP packet size for improved Traffic Flow Confidentiality. The padding defines the minimum size of all ESP packets sent. The default value of - 0 disables TFC padding, the special value - mtu adds TFC padding to create a packet size equal to + `0` disables TFC padding, the special value + `mtu` adds TFC padding to create a packet size equal to the Path Maximum Transfer Unit. ''; replay_window = mkIntParam 32 '' IPsec replay window to configure for this CHILD_SA. Larger values than - the default of 32 are supported using the Netlink - backend only, a value of 0 disables IPsec replay + the default of `32` are supported using the Netlink + backend only, a value of `0` disables IPsec replay protection. ''; hw_offload = mkEnumParam ["yes" "no" "auto"] "no" '' Enable hardware offload for this CHILD_SA, if supported by the IPsec - implementation. The value yes enforces offloading + implementation. The value `yes` enforces offloading and the installation will fail if it's not supported by either kernel or - device. The value auto enables offloading, if it's + device. The value `auto` enables offloading, if it's supported, but the installation does not fail otherwise. ''; @@ -1055,55 +1008,42 @@ in { copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" '' Whether to copy the DSCP (Differentiated Services Field Codepoint) header field to/from the outer IP header in tunnel mode. The value - out only copies the field from the inner to the outer - header, the value in does the opposite and only + `out` only copies the field from the inner to the outer + header, the value `in` does the opposite and only copies the field from the outer to the inner header when decapsulating, - the value yes copies the field in both directions, - and the value no disables copying the field - altogether. Setting this to yes or - in could allow an attacker to adversely affect other + the value `yes` copies the field in both directions, + and the value `no` disables copying the field + altogether. Setting this to `yes` or + `in` could allow an attacker to adversely affect other traffic at the receiver, which is why the default is - out. Controlling this behavior is not supported by + `out`. Controlling this behavior is not supported by all kernel interfaces. ''; start_action = mkEnumParam ["none" "trap" "start"] "none" '' Action to perform after loading the configuration. - - - The default of none loads the connection only, which - then can be manually initiated or used as a responder configuration. - - - The value trap installs a trap policy, which triggers - the tunnel as soon as matching traffic has been detected. - - - The value start initiates the connection actively. - - + + - The default of `none` loads the connection only, which + then can be manually initiated or used as a responder configuration. + - The value `trap` installs a trap policy, which triggers + the tunnel as soon as matching traffic has been detected. + - The value `start` initiates the connection actively. + When unloading or replacing a CHILD_SA configuration having a - different from none, + {option}`start_action` different from `none`, the inverse action is performed. Configurations with - start get closed, while such with - trap get uninstalled. + `start` get closed, while such with + `trap` get uninstalled. ''; close_action = mkEnumParam ["none" "trap" "start"] "none" '' Action to perform after a CHILD_SA gets closed by the peer. - - - The default of none does not take any action, - - - trap installs a trap policy for the CHILD_SA. - - - start tries to re-create the CHILD_SA. - - - does not provide any guarantee that the + - The default of `none` does not take any action, + - `trap` installs a trap policy for the CHILD_SA. + - `start` tries to re-create the CHILD_SA. + + {option}`close_action` does not provide any guarantee that the CHILD_SA is kept alive. It acts on explicit close messages only, but not on negotiation failures. Use trap policies to reliably re-create failed CHILD_SAs. @@ -1111,9 +1051,9 @@ in { } '' CHILD_SA configuration sub-section. Each connection definition may have - one or more sections in its subsection. The + one or more sections in its {option}`children` subsection. The section name defines the name of the CHILD_SA configuration, which must be - unique within the connection (denoted <child> below). + unique within the connection (denoted \ below). ''; } '' Section defining IKE connection configurations, each in its own subsection @@ -1130,13 +1070,13 @@ in { id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' Identity the EAP/XAuth secret belongs to. Multiple unique identities may - be specified, each having an id prefix, if a secret + be specified, each having an `id` prefix, if a secret is shared between multiple users. ''; } '' EAP secret section for a specific secret. Each EAP secret is defined in a - unique section having the eap prefix. EAP secrets are + unique section having the `eap` prefix. EAP secrets are used for XAuth authentication as well. ''; @@ -1160,7 +1100,7 @@ in { ''; } '' NTLM secret section for a specific secret. Each NTLM secret is defined in - a unique section having the ntlm prefix. NTLM secrets + a unique section having the `ntlm` prefix. NTLM secrets may only be used for EAP-MSCHAPv2 authentication. ''; @@ -1173,30 +1113,30 @@ in { id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' IKE identity the IKE preshared secret belongs to. Multiple unique - identities may be specified, each having an id + identities may be specified, each having an `id` prefix, if a secret is shared between multiple peers. ''; } '' IKE preshared secret section for a specific secret. Each IKE PSK is - defined in a unique section having the ike prefix. + defined in a unique section having the `ike` prefix. ''; ppk = mkPrefixedAttrsOfParams { secret = mkOptionalStrParam '' Value of the PPK. It may either be an ASCII string, a hex encoded string - if it has a 0x prefix or a Base64 encoded string if - it has a 0s prefix in its value. Should have at least + if it has a `0x` prefix or a Base64 encoded string if + it has a `0s` prefix in its value. Should have at least 256 bits of entropy for 128-bit security. ''; id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' PPK identity the PPK belongs to. Multiple unique identities may be - specified, each having an id prefix, if a secret is + specified, each having an `id` prefix, if a secret is shared between multiple peers. ''; } '' Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is - defined in a unique section having the ppk prefix. + defined in a unique section having the `ppk` prefix. ''; private = mkPrefixedAttrsOfParams { @@ -1209,25 +1149,25 @@ in { ''; } '' Private key decryption passphrase for a key in the - private folder. + `private` folder. ''; rsa = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' - File name in the rsa folder for which this passphrase + File name in the `rsa` folder for which this passphrase should be used. ''; secret = mkOptionalStrParam '' Value of decryption passphrase for RSA key. ''; } '' - Private key decryption passphrase for a key in the rsa + Private key decryption passphrase for a key in the `rsa` folder. ''; ecdsa = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' - File name in the ecdsa folder for which this + File name in the `ecdsa` folder for which this passphrase should be used. ''; secret = mkOptionalStrParam '' @@ -1235,12 +1175,12 @@ in { ''; } '' Private key decryption passphrase for a key in the - ecdsa folder. + `ecdsa` folder. ''; pkcs8 = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' - File name in the pkcs8 folder for which this + File name in the `pkcs8` folder for which this passphrase should be used. ''; secret = mkOptionalStrParam '' @@ -1248,12 +1188,12 @@ in { ''; } '' Private key decryption passphrase for a key in the - pkcs8 folder. + `pkcs8` folder. ''; pkcs12 = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' - File name in the pkcs12 folder for which this + File name in the `pkcs12` folder for which this passphrase should be used. ''; secret = mkOptionalStrParam '' @@ -1261,7 +1201,7 @@ in { ''; } '' PKCS#12 decryption passphrase for a container in the - pkcs12 folder. + `pkcs12` folder. ''; token = mkPrefixedAttrsOfParams { @@ -1281,7 +1221,7 @@ in { pin = mkOptionalStrParam '' Optional PIN required to access the key on the token. If none is provided the user is prompted during an interactive - --load-creds call. + `--load-creds` call. ''; } "Definition for a private key that's stored on a token/smartcard/TPM."; @@ -1291,7 +1231,7 @@ in { addrs = mkOptionalStrParam '' Subnet or range defining addresses allocated in pool. Accepts a single CIDR subnet defining the pool to allocate addresses from or an address - range (<from>-<to>). Pools must be unique and non-overlapping. + range (\-\). Pools must be unique and non-overlapping. ''; dns = mkCommaSepListParam [] "Address or CIDR subnets"; @@ -1305,6 +1245,6 @@ in { } '' Section defining named pools. Named pools may be referenced by connections with the pools option to assign virtual IPs and other configuration - attributes. Each pool must have a unique name (denoted <name> below). + attributes. Each pool must have a unique name (denoted \ below). ''; } diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index b26adbf8719b..215d1ac23d4c 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -27,7 +27,8 @@ let type = types.bool; name = nixosName; value = mkOption { - inherit description default; + description = lib.mdDoc description; + inherit default; type = types.bool; }; }; @@ -68,16 +69,16 @@ let Whether users are included. '') (yesNoOption "userlistDeny" "userlist_deny" false '' - Specifies whether is a list of user + Specifies whether {option}`userlistFile` is a list of user names to allow or deny access. - The default false means whitelist/allow. + The default `false` means whitelist/allow. '') (yesNoOption "forceLocalLoginsSSL" "force_local_logins_ssl" false '' - Only applies if is true. Non anonymous (local) users + Only applies if {option}`sslEnable` is true. Non anonymous (local) users must use a secure SSL connection to send a password. '') (yesNoOption "forceLocalDataSSL" "force_local_data_ssl" false '' - Only applies if is true. Non anonymous (local) users + Only applies if {option}`sslEnable` is true. Non anonymous (local) users must use a secure SSL connection for sending/receiving data on data connection. '') (yesNoOption "portPromiscuous" "port_promiscuous" false '' @@ -86,17 +87,17 @@ let know what you are doing! '') (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' - Only applies if is activated. If + Only applies if {option}`ssl_enable` is activated. If enabled, this option will permit TLS v1 protocol connections. TLS v1 connections are preferred. '') (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' - Only applies if is activated. If + Only applies if {option}`ssl_enable` is activated. If enabled, this option will permit SSL v2 protocol connections. TLS v1 connections are preferred. '') (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' - Only applies if is activated. If + Only applies if {option}`ssl_enable` is activated. If enabled, this option will permit SSL v3 protocol connections. TLS v1 connections are preferred. '') @@ -184,9 +185,9 @@ in type = types.nullOr types.str; example = "/etc/vsftpd/userDb"; default = null; - description = '' - Only applies if is true. - Path pointing to the pam_userdb user + description = lib.mdDoc '' + Only applies if {option}`enableVirtualUsers` is true. + Path pointing to the `pam_userdb` user database used by vsftpd to authenticate the virtual users. This user list should be stored in the Berkeley DB database @@ -194,21 +195,21 @@ in To generate a new user database, create a text file, add your users using the following format: - + ``` user1 password1 user2 password2 - + ``` - You can then install pkgs.db to generate + You can then install `pkgs.db` to generate the Berkeley DB using - + ``` db_load -T -t hash -f logins.txt userDb.db - + ``` - Caution: pam_userdb will automatically - append a .db suffix to the filename you + Caution: `pam_userdb` will automatically + append a `.db` suffix to the filename you provide though this option. This option shouldn't include this filetype suffix. ''; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 17caeab27264..761f576495a6 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -100,7 +100,7 @@ in confDir = mkOption { type = types.path; default = confDir; - defaultText = literalDocBook "generated from configuration"; + defaultText = literalMD "generated from configuration"; description = lib.mdDoc "The location of the config files for xrdp."; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 84f577c3853b..30fd6f569c72 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -9,7 +9,7 @@ let stateDir = "/var/lib/tor"; runDir = "/run/tor"; descriptionGeneric = option: '' - See torrc manual. + See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en#${option}). ''; bindsPrivilegedPort = any (p0: @@ -30,22 +30,22 @@ let optionBool = optionName: mkOption { type = with types; nullOr bool; default = null; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionInt = optionName: mkOption { type = with types; nullOr int; default = null; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionString = optionName: mkOption { type = with types; nullOr str; default = null; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionStrings = optionName: mkOption { type = with types; listOf str; default = []; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionAddress = mkOption { type = with types; nullOr str; @@ -69,7 +69,7 @@ let optionPorts = optionName: mkOption { type = with types; listOf port; default = []; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionIsolablePort = with types; oneOf [ port (enum ["auto"]) @@ -89,7 +89,7 @@ let optionIsolablePorts = optionName: mkOption { default = []; type = with types; either optionIsolablePort (listOf optionIsolablePort); - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; isolateFlags = [ "IsolateClientAddr" @@ -144,17 +144,17 @@ let }; })) ]))]; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionBandwith = optionName: mkOption { type = with types; nullOr (either int str); default = null; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; optionPath = optionName: mkOption { type = with types; nullOr path; default = null; - description = descriptionGeneric optionName; + description = lib.mdDoc (descriptionGeneric optionName); }; mkValueString = k: v: @@ -262,7 +262,7 @@ in }; onionServices = mkOption { - description = descriptionGeneric "HiddenServiceDir"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceDir"); default = {}; example = { "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" = { @@ -271,11 +271,14 @@ in }; type = types.attrsOf (types.submodule ({name, config, ...}: { options.clientAuthorizations = mkOption { - description = '' + description = lib.mdDoc '' Clients' authorizations for a v3 onion service, as a list of files containing each one private key, in the format: - descriptor:x25519:<base32-private-key> - '' + descriptionGeneric "_client_authorization"; + ``` + descriptor:x25519: + ``` + ${descriptionGeneric "_client_authorization"} + ''; type = with types; listOf path; default = []; example = ["/run/keys/tor/alice.prv.x25519"]; @@ -429,7 +432,7 @@ in }; onionServices = mkOption { - description = descriptionGeneric "HiddenServiceDir"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceDir"); default = {}; example = { "example.org/www" = { @@ -462,7 +465,7 @@ in ''; }; options.authorizeClient = mkOption { - description = descriptionGeneric "HiddenServiceAuthorizeClient"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceAuthorizeClient"); default = null; type = types.nullOr (types.submodule ({...}: { options = { @@ -487,17 +490,20 @@ in })); }; options.authorizedClients = mkOption { - description = '' + description = lib.mdDoc '' Authorized clients for a v3 onion service, as a list of public key, in the format: - descriptor:x25519:<base32-public-key> - '' + descriptionGeneric "_client_authorization"; + ``` + descriptor:x25519: + ``` + ${descriptionGeneric "_client_authorization"} + ''; type = with types; listOf str; default = []; example = ["descriptor:x25519:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"]; }; options.map = mkOption { - description = descriptionGeneric "HiddenServicePort"; + description = lib.mdDoc (descriptionGeneric "HiddenServicePort"); type = with types; listOf (oneOf [ port (submodule ({...}: { options = { @@ -518,14 +524,15 @@ in apply = map (v: if isInt v then {port=v; target=null;} else v); }; options.version = mkOption { - description = descriptionGeneric "HiddenServiceVersion"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceVersion"); type = with types; nullOr (enum [2 3]); default = null; }; options.settings = mkOption { - description = '' + description = lib.mdDoc '' Settings of the onion service. - '' + descriptionGeneric "_hidden_service_options"; + ${descriptionGeneric "_hidden_service_options"} + ''; default = {}; type = types.submodule { freeformType = with types; @@ -535,18 +542,18 @@ in options.HiddenServiceAllowUnknownPorts = optionBool "HiddenServiceAllowUnknownPorts"; options.HiddenServiceDirGroupReadable = optionBool "HiddenServiceDirGroupReadable"; options.HiddenServiceExportCircuitID = mkOption { - description = descriptionGeneric "HiddenServiceExportCircuitID"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceExportCircuitID"); type = with types; nullOr (enum ["haproxy"]); default = null; }; options.HiddenServiceMaxStreams = mkOption { - description = descriptionGeneric "HiddenServiceMaxStreams"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceMaxStreams"); type = with types; nullOr (ints.between 0 65535); default = null; }; options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit"; options.HiddenServiceNumIntroductionPoints = mkOption { - description = descriptionGeneric "HiddenServiceNumIntroductionPoints"; + description = lib.mdDoc (descriptionGeneric "HiddenServiceNumIntroductionPoints"); type = with types; nullOr (ints.between 0 20); default = null; }; @@ -605,7 +612,7 @@ in options.ClientAutoIPv6ORPort = optionBool "ClientAutoIPv6ORPort"; options.ClientDNSRejectInternalAddresses = optionBool "ClientDNSRejectInternalAddresses"; options.ClientOnionAuthDir = mkOption { - description = descriptionGeneric "ClientOnionAuthDir"; + description = lib.mdDoc (descriptionGeneric "ClientOnionAuthDir"); default = null; type = with types; nullOr path; }; @@ -618,7 +625,7 @@ in options.ConstrainedSockets = optionBool "ConstrainedSockets"; options.ContactInfo = optionString "ContactInfo"; options.ControlPort = mkOption rec { - description = descriptionGeneric "ControlPort"; + description = lib.mdDoc (descriptionGeneric "ControlPort"); default = []; example = [{port = 9051;}]; type = with types; oneOf [port (enum ["auto"]) (listOf (oneOf [ @@ -653,7 +660,7 @@ in options.DormantTimeoutDisabledByIdleStreams = optionBool "DormantTimeoutDisabledByIdleStreams"; options.DirCache = optionBool "DirCache"; options.DirPolicy = mkOption { - description = descriptionGeneric "DirPolicy"; + description = lib.mdDoc (descriptionGeneric "DirPolicy"); type = with types; listOf str; default = []; example = ["accept *:*"]; @@ -680,7 +687,7 @@ in options.ExitPortStatistics = optionBool "ExitPortStatistics"; options.ExitRelay = optionBool "ExitRelay"; # default is null and like "auto" options.ExtORPort = mkOption { - description = descriptionGeneric "ExtORPort"; + description = lib.mdDoc (descriptionGeneric "ExtORPort"); default = null; type = with types; nullOr (oneOf [ port (enum ["auto"]) (submodule ({...}: { @@ -709,7 +716,7 @@ in options.GeoIPv6File = optionPath "GeoIPv6File"; options.GuardfractionFile = optionPath "GuardfractionFile"; options.HidServAuth = mkOption { - description = descriptionGeneric "HidServAuth"; + description = lib.mdDoc (descriptionGeneric "HidServAuth"); default = []; type = with types; listOf (oneOf [ (submodule { @@ -760,7 +767,7 @@ in options.ProtocolWarnings = optionBool "ProtocolWarnings"; options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors"; options.PublishServerDescriptor = mkOption { - description = descriptionGeneric "PublishServerDescriptor"; + description = lib.mdDoc (descriptionGeneric "PublishServerDescriptor"); type = with types; nullOr (enum [false true 0 1 "0" "1" "v3" "bridge"]); default = null; }; @@ -778,7 +785,7 @@ in options.ServerDNSResolvConfFile = optionPath "ServerDNSResolvConfFile"; options.ServerDNSSearchDomains = optionBool "ServerDNSSearchDomains"; options.ServerTransportPlugin = mkOption { - description = descriptionGeneric "ServerTransportPlugin"; + description = lib.mdDoc (descriptionGeneric "ServerTransportPlugin"); default = null; type = with types; nullOr (submodule ({...}: { options = { @@ -797,13 +804,13 @@ in options.ShutdownWaitLength = mkOption { type = types.int; default = 30; - description = descriptionGeneric "ShutdownWaitLength"; + description = lib.mdDoc (descriptionGeneric "ShutdownWaitLength"); }; options.SocksPolicy = optionStrings "SocksPolicy" // { example = ["accept *:*"]; }; options.SOCKSPort = mkOption { - description = descriptionGeneric "SOCKSPort"; + description = lib.mdDoc (descriptionGeneric "SOCKSPort"); default = if cfg.settings.HiddenServiceNonAnonymousMode == true then [{port = 0;}] else []; defaultText = literalExpression '' if config.${opt.settings}.HiddenServiceNonAnonymousMode == true @@ -816,7 +823,7 @@ in options.TestingTorNetwork = optionBool "TestingTorNetwork"; options.TransPort = optionIsolablePorts "TransPort"; options.TransProxyType = mkOption { - description = descriptionGeneric "TransProxyType"; + description = lib.mdDoc (descriptionGeneric "TransProxyType"); type = with types; nullOr (enum ["default" "TPROXY" "ipfw" "pf-divert"]); default = null; }; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 0ebc6f5399c0..a1ab3bfca4a6 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -100,9 +100,9 @@ in enableACME = lib.mkOption { type = lib.types.bool; default = cfg.sslCertificate == null && cfg.sslCertificateKey == null; - defaultText = lib.literalDocBook '' - true, unless - and are set. + defaultText = lib.literalMD '' + `true`, unless {option}`services.discourse.sslCertificate` + and {option}`services.discourse.sslCertificateKey` are set. ''; description = lib.mdDoc '' Whether an ACME certificate should be used to secure diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index b878cb74b52e..26bed24eed27 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -20,7 +20,7 @@ let mkDefault literalExpression isAttrs - literalDocBook + literalMD maintainers catAttrs collect @@ -165,7 +165,7 @@ in mkOption { type = port; default = dbPorts.${cfg.database.type}; - defaultText = literalDocBook "default port of selected database"; + defaultText = literalMD "default port of selected database"; description = lib.mdDoc '' Port of the database to connect to. ''; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index efd4d0af7605..84c6b077d03f 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -527,7 +527,7 @@ in { occ = mkOption { type = types.package; default = occ; - defaultText = literalDocBook "generated script"; + defaultText = literalMD "generated script"; internal = true; description = '' The nextcloud-occ program preconfigured to target this Nextcloud instance. diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix new file mode 100644 index 000000000000..c363760d5c2d --- /dev/null +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -0,0 +1,485 @@ +{ config, lib, pkgs, ... }: + +let + inherit (builtins) toString; + inherit (lib) types mkIf mkOption mkDefault; + inherit (lib) optional optionals optionalAttrs optionalString; + + inherit (pkgs) sqlite; + + format = pkgs.formats.ini { + mkKeyValue = key: value: + let + value' = if builtins.isNull value then + "" + else if builtins.isBool value then + if value == true then "true" else "false" + else + toString value; + in "${key} = ${value'}"; + }; + + cfg = config.services.writefreely; + + isSqlite = cfg.database.type == "sqlite3"; + isMysql = cfg.database.type == "mysql"; + isMysqlLocal = isMysql && cfg.database.createLocally == true; + + hostProtocol = if cfg.acme.enable then "https" else "http"; + + settings = cfg.settings // { + app = cfg.settings.app or { } // { + host = cfg.settings.app.host or "${hostProtocol}://${cfg.host}"; + }; + + database = if cfg.database.type == "sqlite3" then { + type = "sqlite3"; + filename = cfg.settings.database.filename or "writefreely.db"; + database = cfg.database.name; + } else { + type = "mysql"; + username = cfg.database.user; + password = "#dbpass#"; + database = cfg.database.name; + host = cfg.database.host; + port = cfg.database.port; + tls = cfg.database.tls; + }; + + server = cfg.settings.server or { } // { + bind = cfg.settings.server.bind or "localhost"; + gopher_port = cfg.settings.server.gopher_port or 0; + autocert = !cfg.nginx.enable && cfg.acme.enable; + templates_parent_dir = + cfg.settings.server.templates_parent_dir or cfg.package.src; + static_parent_dir = cfg.settings.server.static_parent_dir or assets; + pages_parent_dir = + cfg.settings.server.pages_parent_dir or cfg.package.src; + keys_parent_dir = cfg.settings.server.keys_parent_dir or cfg.stateDir; + }; + }; + + configFile = format.generate "config.ini" settings; + + assets = pkgs.stdenvNoCC.mkDerivation { + pname = "writefreely-assets"; + + inherit (cfg.package) version src; + + nativeBuildInputs = with pkgs.nodePackages; [ less ]; + + buildPhase = '' + mkdir -p $out + + cp -r static $out/ + ''; + + installPhase = '' + less_dir=$src/less + css_dir=$out/static/css + + lessc $less_dir/app.less $css_dir/write.css + lessc $less_dir/fonts.less $css_dir/fonts.css + lessc $less_dir/icons.less $css_dir/icons.css + lessc $less_dir/prose.less $css_dir/prose.css + ''; + }; + + withConfigFile = text: '' + db_pass=${ + optionalString (cfg.database.passwordFile != null) + "$(head -n1 ${cfg.database.passwordFile})" + } + + cp -f ${configFile} '${cfg.stateDir}/config.ini' + sed -e "s,#dbpass#,$db_pass,g" -i '${cfg.stateDir}/config.ini' + chmod 440 '${cfg.stateDir}/config.ini' + + ${text} + ''; + + withMysql = text: + withConfigFile '' + query () { + local result=$(${config.services.mysql.package}/bin/mysql \ + --user=${cfg.database.user} \ + --password=$db_pass \ + --database=${cfg.database.name} \ + --silent \ + --raw \ + --skip-column-names \ + --execute "$1" \ + ) + + echo $result + } + + ${text} + ''; + + withSqlite = text: + withConfigFile '' + query () { + local result=$(${sqlite}/bin/sqlite3 \ + '${cfg.stateDir}/${settings.database.filename}' + "$1" \ + ) + + echo $result + } + + ${text} + ''; +in { + options.services.writefreely = { + enable = + lib.mkEnableOption "Writefreely, build a digital writing community"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.writefreely; + defaultText = lib.literalExpression "pkgs.writefreely"; + description = "Writefreely package to use."; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/writefreely"; + description = "The state directory where keys and data are stored."; + }; + + user = mkOption { + type = types.str; + default = "writefreely"; + description = "User under which Writefreely is ran."; + }; + + group = mkOption { + type = types.str; + default = "writefreely"; + description = "Group under which Writefreely is ran."; + }; + + host = mkOption { + type = types.str; + default = ""; + description = "The public host name to serve."; + example = "example.com"; + }; + + settings = mkOption { + default = { }; + description = '' + Writefreely configuration (config.ini). Refer to + + for details. + ''; + + type = types.submodule { + freeformType = format.type; + + options = { + app = { + theme = mkOption { + type = types.str; + default = "write"; + description = "The theme to apply."; + }; + }; + + server = { + port = mkOption { + type = types.port; + default = if cfg.nginx.enable then 18080 else 80; + defaultText = "80"; + description = "The port WriteFreely should listen on."; + }; + }; + }; + }; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "mysql" ]; + default = "sqlite3"; + description = "The database provider to use."; + }; + + name = mkOption { + type = types.str; + default = "writefreely"; + description = "The name of the database to store data in."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = if cfg.database.type == "mysql" then "writefreely" else null; + defaultText = "writefreely"; + description = "The database user to connect as."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "The file to load the database password from."; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "The database host to connect to."; + }; + + port = mkOption { + type = types.port; + default = 3306; + description = "The port used when connecting to the database host."; + }; + + tls = mkOption { + type = types.bool; + default = false; + description = + "Whether or not TLS should be used for the database connection."; + }; + + migrate = mkOption { + type = types.bool; + default = true; + description = + "Whether or not to automatically run migrations on startup."; + }; + + createLocally = mkOption { + type = types.bool; + default = false; + description = '' + When is set to + "mysql", this option will enable the MySQL service locally. + ''; + }; + }; + + admin = { + name = mkOption { + type = types.nullOr types.str; + description = "The name of the first admin user."; + default = null; + }; + + initialPasswordFile = mkOption { + type = types.path; + description = '' + Path to a file containing the initial password for the admin user. + If not provided, the default password will be set to nixos. + ''; + default = pkgs.writeText "default-admin-pass" "nixos"; + defaultText = "/nix/store/xxx-default-admin-pass"; + }; + }; + + nginx = { + enable = mkOption { + type = types.bool; + default = false; + description = + "Whether or not to enable and configure nginx as a proxy for WriteFreely."; + }; + + forceSSL = mkOption { + type = types.bool; + default = false; + description = "Whether or not to force the use of SSL."; + }; + }; + + acme = { + enable = mkOption { + type = types.bool; + default = false; + description = + "Whether or not to automatically fetch and configure SSL certs."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.host != ""; + message = "services.writefreely.host must be set"; + } + { + assertion = isMysqlLocal -> cfg.database.passwordFile != null; + message = + "services.writefreely.database.passwordFile must be set if services.writefreely.database.createLocally is set to true"; + } + { + assertion = isSqlite -> !cfg.database.createLocally; + message = + "services.writefreely.database.createLocally has no use when services.writefreely.database.type is set to sqlite3"; + } + ]; + + users = { + users = optionalAttrs (cfg.user == "writefreely") { + writefreely = { + group = cfg.group; + home = cfg.stateDir; + isSystemUser = true; + }; + }; + + groups = + optionalAttrs (cfg.group == "writefreely") { writefreely = { }; }; + }; + + systemd.tmpfiles.rules = + [ "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" ]; + + systemd.services.writefreely = { + after = [ "network.target" ] + ++ optional isSqlite "writefreely-sqlite-init.service" + ++ optional isMysql "writefreely-mysql-init.service" + ++ optional isMysqlLocal "mysql.service"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + Restart = "always"; + RestartSec = 20; + ExecStart = + "${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' serve"; + AmbientCapabilities = + optionalString (settings.server.port < 1024) "cap_net_bind_service"; + }; + + preStart = '' + if ! test -d "${cfg.stateDir}/keys"; then + mkdir -p ${cfg.stateDir}/keys + + # Key files end up with the wrong permissions by default. + # We need to correct them so that Writefreely can read them. + chmod -R 750 "${cfg.stateDir}/keys" + + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' keys generate + fi + ''; + }; + + systemd.services.writefreely-sqlite-init = mkIf isSqlite { + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ReadOnlyPaths = optional (cfg.admin.initialPasswordFile != null) + cfg.admin.initialPasswordFile; + }; + + script = let + migrateDatabase = optionalString cfg.database.migrate '' + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db migrate + ''; + + createAdmin = optionalString (cfg.admin.name != null) '' + if [[ $(query "SELECT COUNT(*) FROM users") == 0 ]]; then + admin_pass=$(head -n1 ${cfg.admin.initialPasswordFile}) + + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' --create-admin ${cfg.admin.name}:$admin_pass + fi + ''; + in withSqlite '' + if ! test -f '${settings.database.filename}'; then + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db init + fi + + ${migrateDatabase} + + ${createAdmin} + ''; + }; + + systemd.services.writefreely-mysql-init = mkIf isMysql { + wantedBy = [ "multi-user.target" ]; + after = optional isMysqlLocal "mysql.service"; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ReadOnlyPaths = optional isMysqlLocal cfg.database.passwordFile + ++ optional (cfg.admin.initialPasswordFile != null) + cfg.admin.initialPasswordFile; + }; + + script = let + updateUser = optionalString isMysqlLocal '' + # WriteFreely currently *requires* a password for authentication, so we + # need to update the user in MySQL accordingly. By default MySQL users + # authenticate with auth_socket or unix_socket. + # See: https://github.com/writefreely/writefreely/issues/568 + ${config.services.mysql.package}/bin/mysql --skip-column-names --execute "ALTER USER '${cfg.database.user}'@'localhost' IDENTIFIED VIA unix_socket OR mysql_native_password USING PASSWORD('$db_pass'); FLUSH PRIVILEGES;" + ''; + + migrateDatabase = optionalString cfg.database.migrate '' + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db migrate + ''; + + createAdmin = optionalString (cfg.admin.name != null) '' + if [[ $(query 'SELECT COUNT(*) FROM users') == 0 ]]; then + admin_pass=$(head -n1 ${cfg.admin.initialPasswordFile}) + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' --create-admin ${cfg.admin.name}:$admin_pass + fi + ''; + in withMysql '' + ${updateUser} + + if [[ $(query "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${cfg.database.name}'") == 0 ]]; then + ${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db init + fi + + ${migrateDatabase} + + ${createAdmin} + ''; + }; + + services.mysql = mkIf isMysqlLocal { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + # WriteFreely requires the use of passwords, so we need permissions + # to `ALTER` the user to add password support and also to reload + # permissions so they can be used. + "*.*" = "CREATE USER, RELOAD"; + }; + }]; + }; + + services.nginx = lib.mkIf cfg.nginx.enable { + enable = true; + recommendedProxySettings = true; + + virtualHosts."${cfg.host}" = { + enableACME = cfg.acme.enable; + forceSSL = cfg.nginx.forceSSL; + + locations."/" = { + proxyPass = "http://127.0.0.1:${toString settings.server.port}"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixos/modules/services/web-servers/lighttpd/collectd.nix index 270517a4e2a5..78d507f1d7d4 100644 --- a/nixos/modules/services/web-servers/lighttpd/collectd.nix +++ b/nixos/modules/services/web-servers/lighttpd/collectd.nix @@ -30,8 +30,8 @@ in collectionCgi = mkOption { type = types.path; default = defaultCollectionCgi; - defaultText = literalDocBook '' - config.${options.services.collectd.package} configured for lighttpd + defaultText = literalMD '' + `config.${options.services.collectd.package}` configured for lighttpd ''; description = lib.mdDoc '' Path to collection.cgi script from (collectd sources)/contrib/collection.cgi diff --git a/nixos/modules/services/web-servers/trafficserver/default.nix b/nixos/modules/services/web-servers/trafficserver/default.nix index beb5e437c5b1..51d6b9050f59 100644 --- a/nixos/modules/services/web-servers/trafficserver/default.nix +++ b/nixos/modules/services/web-servers/trafficserver/default.nix @@ -62,7 +62,7 @@ in ipAllow = mkOption { type = types.nullOr yaml.type; default = lib.importJSON ./ip_allow.json; - defaultText = literalDocBook "upstream defaults"; + defaultText = literalMD "upstream defaults"; example = literalExpression '' { ip_allow = [{ @@ -85,7 +85,7 @@ in logging = mkOption { type = types.nullOr yaml.type; default = lib.importJSON ./logging.json; - defaultText = literalDocBook "upstream defaults"; + defaultText = literalMD "upstream defaults"; example = { }; description = lib.mdDoc '' Configure logs. diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 03bf5d1cd2da..cfb7cfb098ea 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -24,7 +24,7 @@ let Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"} Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"} - Xft.hintstyle: hintslight + Xft.hintstyle: ${fontconfig.hinting.style} ''; # file provided by services.xserver.displayManager.sessionData.wrapper @@ -285,7 +285,7 @@ in defaultSessionFromLegacyOptions else null; - defaultText = literalDocBook '' + defaultText = literalMD '' Taken from display manager settings or window manager settings, if either is set. ''; example = "gnome"; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 3a57642a53ee..5a61d5463d21 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -143,7 +143,7 @@ in readOnly = true; internal = true; default = systemActivationScript (removeAttrs config.system.activationScripts [ "script" ]) true; - defaultText = literalDocBook "generated activation script"; + defaultText = literalMD "generated activation script"; }; system.userActivationScripts = mkOption { diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 02d8fcf4799c..6e20d7dc5e0f 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -75,10 +75,10 @@ in themePackages = mkOption { default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth; - defaultText = literalDocBook '' + defaultText = literalMD '' A NixOS branded variant of the breeze theme when - config.${opt.theme} == "breeze", otherwise - [ ]. + `config.${opt.theme} == "breeze"`, otherwise + `[ ]`. ''; type = types.listOf types.package; description = lib.mdDoc '' diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 37adcc531d3d..66b51cd72606 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -611,7 +611,7 @@ in then "zstd" else "gzip" ); - defaultText = literalDocBook "zstd if the kernel supports it (5.9+), gzip if not"; + defaultText = literalMD "`zstd` if the kernel supports it (5.9+), `gzip` if not"; type = types.either types.str (types.functionTo types.str); description = '' The compressor to use on the initrd image. May be any of: diff --git a/nixos/modules/system/boot/systemd/shutdown.nix b/nixos/modules/system/boot/systemd/shutdown.nix index cb257dce6f04..5b190700c5d5 100644 --- a/nixos/modules/system/boot/systemd/shutdown.nix +++ b/nixos/modules/system/boot/systemd/shutdown.nix @@ -33,26 +33,30 @@ in { systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown"; systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"]; + systemd.mounts = [{ + what = "tmpfs"; + where = "/run/initramfs"; + type = "tmpfs"; + }]; + systemd.services.generate-shutdown-ramfs = { description = "Generate shutdown ramfs"; wantedBy = [ "shutdown.target" ]; before = [ "shutdown.target" ]; unitConfig = { DefaultDependencies = false; + RequiresMountsFor = "/run/initramfs"; ConditionFileIsExecutable = [ "!/run/initramfs/shutdown" ]; }; - path = [pkgs.util-linux pkgs.makeInitrdNGTool]; - serviceConfig.Type = "oneshot"; - script = '' - mkdir -p /run/initramfs - if ! mountpoint -q /run/initramfs; then - mount -t tmpfs tmpfs /run/initramfs - fi - make-initrd-ng ${ramfsContents} /run/initramfs - ''; + serviceConfig = { + Type = "oneshot"; + ProtectSystem = "strict"; + ReadWritePaths = "/run/initramfs"; + ExecStart = "${pkgs.makeInitrdNGTool}/bin/make-initrd-ng ${ramfsContents} /run/initramfs"; + }; }; }; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 0975ed0aab9b..098f9031628d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -209,7 +209,7 @@ in readOnly = true; type = types.bool; default = inInitrd || inSystem; - defaultText = literalDocBook "true if ZFS filesystem support is enabled"; + defaultText = literalMD "`true` if ZFS filesystem support is enabled"; description = lib.mdDoc "True if ZFS filesystem support is enabled"; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index eb4818756bb1..e2a17c246bd9 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -172,13 +172,13 @@ let type = types.enum (lib.attrNames tempaddrValues); default = cfg.tempAddresses; defaultText = literalExpression ''config.networking.tempAddresses''; - description = '' + description = lib.mdDoc '' When IPv6 is enabled with SLAAC, this option controls the use of temporary address (aka privacy extensions) on this interface. This is used to reduce tracking. See also the global option - , which + [](#opt-networking.tempAddresses), which applies to all interfaces where this is not set. Possible values are: @@ -227,15 +227,19 @@ let { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; } ]; type = with types; listOf (submodule (routeOpts 4)); - description = '' + description = lib.mdDoc '' List of extra IPv4 static routes that will be assigned to the interface. - If the route type is the default unicast, then the scope - is set differently depending on the value of : - the script-based backend sets it to link, while networkd sets - it to global. + + ::: {.warning} + If the route type is the default `unicast`, then the scope + is set differently depending on the value of {option}`networking.useNetworkd`: + the script-based backend sets it to `link`, while networkd sets + it to `global`. + ::: + If you want consistency between the two implementations, set the scope of the route manually with - networking.interfaces.eth0.ipv4.routes = [{ options.scope = "global"; }] + `networking.interfaces.eth0.ipv4.routes = [{ options.scope = "global"; }]` for example. ''; }; @@ -407,17 +411,10 @@ let description = "generate IPv6 temporary addresses and use these as source addresses in routing"; }; }; - tempaddrDoc = '' - - ${concatStringsSep "\n" (mapAttrsToList (name: { description, ... }: '' - - - "${name}" to ${description}; - - - '') tempaddrValues)} - - ''; + tempaddrDoc = concatStringsSep "\n" + (mapAttrsToList + (name: { description, ... }: ''- `"${name}"` to ${description};'') + tempaddrValues); hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" @@ -1241,17 +1238,15 @@ in type = types.nullOr types.str; default = null; example = "02:00:00:00:00:01"; - description = '' - MAC address to use for the device. If null, then the MAC of the + description = lib.mdDoc '' + MAC address to use for the device. If `null`, then the MAC of the underlying hardware WLAN device is used. INFO: Locally administered MAC addresses are of the form: - - x2:xx:xx:xx:xx:xx - x6:xx:xx:xx:xx:xx - xA:xx:xx:xx:xx:xx - xE:xx:xx:xx:xx:xx - + - x2:xx:xx:xx:xx:xx + - x6:xx:xx:xx:xx:xx + - xA:xx:xx:xx:xx:xx + - xE:xx:xx:xx:xx:xx ''; }; @@ -1287,10 +1282,10 @@ in if ''${config.${opt.enableIPv6}} then "default" else "disabled" ''; type = types.enum (lib.attrNames tempaddrValues); - description = '' + description = lib.mdDoc '' Whether to enable IPv6 Privacy Extensions for interfaces not configured explicitly in - . + [](#opt-networking.interfaces._name_.tempAddress). This sets the ipv6.conf.*.use_tempaddr sysctl for all interfaces. Possible values are: diff --git a/nixos/modules/virtualisation/digital-ocean-init.nix b/nixos/modules/virtualisation/digital-ocean-init.nix index e29e34c4775f..1a5d4e898e96 100644 --- a/nixos/modules/virtualisation/digital-ocean-init.nix +++ b/nixos/modules/virtualisation/digital-ocean-init.nix @@ -20,7 +20,7 @@ in { options.virtualisation.digitalOcean.defaultConfigFile = mkOption { type = types.path; default = defaultConfigFile; - defaultText = literalDocBook '' + defaultText = literalMD '' The default configuration imports user-data if applicable and `(modulesPath + "/virtualisation/digital-ocean-config.nix")`. ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 08b3063687e9..e8ea79d651a0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -622,6 +622,7 @@ in { wmderland = handleTest ./wmderland.nix {}; wpa_supplicant = handleTest ./wpa_supplicant.nix {}; wordpress = handleTest ./wordpress.nix {}; + writefreely = handleTest ./web-apps/writefreely.nix {}; xandikos = handleTest ./xandikos.nix {}; xautolock = handleTest ./xautolock.nix {}; xfce = handleTest ./xfce.nix {}; diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index a51b36ff5308..6e733bb96c1c 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -18,6 +18,8 @@ in import ./make-test-python.nix ({ pkgs, ... }: { serverProperties = { enable-rcon = true; level-seed = seed; + level-type = "flat"; + generate-structures = false; online-mode = false; "rcon.password" = rcon-pass; "rcon.port" = rcon-port; diff --git a/nixos/tests/web-apps/writefreely.nix b/nixos/tests/web-apps/writefreely.nix new file mode 100644 index 000000000000..ce614909706b --- /dev/null +++ b/nixos/tests/web-apps/writefreely.nix @@ -0,0 +1,44 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../../.. { inherit system config; } }: + +with import ../../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + writefreelyTest = { name, type }: + makeTest { + name = "writefreely-${name}"; + + nodes.machine = { config, pkgs, ... }: { + services.writefreely = { + enable = true; + host = "localhost:3000"; + admin.name = "nixos"; + + database = { + inherit type; + createLocally = type == "mysql"; + passwordFile = pkgs.writeText "db-pass" "pass"; + }; + + settings.server.port = 3000; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("writefreely.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000") + ''; + }; +in { + sqlite = writefreelyTest { + name = "sqlite"; + type = "sqlite3"; + }; + mysql = writefreelyTest { + name = "mysql"; + type = "mysql"; + }; +} diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index 7f3a1315873f..e44b68f966dd 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dcb1mnqvf2MvwljWuqMV/8AyF/aGMcDiz4cRQ9NAFtM="; + sha256 = "sha256-h/hXHQfLiDkVKYZFsjyq2+w1Pnn3lR6H+r+fXYkP5ZY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 7408f57a1a98..f19afcefc606 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94="; + sha256 = "sha256-+9PmpmsF08oU//pJOWaoGQzG7a2O13kYqKbGwVRAMlU="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index e6027eef06af..b2f280650da7 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -8,28 +8,38 @@ , lua5_3 , libid3tag , flac -, pcre +, pcre2 +, gzip +, perl }: stdenv.mkDerivation rec { pname = "mympd"; - version = "8.0.4"; + version = "9.5.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-hpUoXqblhHreDZg8fDD5S4UG+ltptIbzP9LKyQ/WbX0="; + sha256 = "sha256-WmGaZXITvrp7ml7s7FPyp3Q3072KU/P6UombBj99fX0="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + pkg-config + cmake + gzip + perl + ]; + preConfigure = '' + env MYMPD_BUILDDIR=$PWD/build ./build.sh createassets + ''; buildInputs = [ libmpdclient openssl lua5_3 libid3tag flac - pcre + pcre2 ]; cmakeFlags = [ @@ -43,7 +53,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "strictoverflow" ]; meta = { - homepage = "https://jcorporation.github.io/mympd"; + homepage = "https://jcorporation.github.io/myMPD"; description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; maintainers = [ lib.maintainers.doronbehar ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 481f151ed561..ae81b13597e1 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "refs/tags/release-${version}"; - sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY="; + sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 8c63212dc2a7..b178d88d7a6b 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.10"; + version = "6.2.16"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-IYbPMjKWDQQrF+JiqBQ2wsjY+Ms93tEdsG75CxipwaI="; + sha256 = "sha256-k6wFTwXMXpLb+nddJ6fOfhzCOrcbQR7Pot8rmrx2gYs="; }; configurePhase = '' diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 03cfae066b2c..30e6ba9b2fa7 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-aHZH3sQNUUPcMRySy8Di0XUoFo4qjGi2pi0phLwORaA="; + sha256 = "sha256-cUiy8ApeUv1K8SEH4APMTvbieGTt4kZYhyB9iGJd/IY="; }; - cargoSha256 = "sha256-EpkB43rMUJO6ouUV9TmQ+RSnGhX32DZHpKic1E6lUyU="; + cargoSha256 = "sha256-Tlq4qDp56PXP4N1UyHjtQoRgDrc/19vIv8uml/lAqqc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 5ae179d9e332..19cc4107fa42 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { install -Dm755 tauon.py $out/bin/tauon mkdir -p $out/share/tauon cp -r lib $out - cp -r assets input.txt t_modules theme $out/share/tauon + cp -r assets input.txt t_modules theme templates $out/share/tauon wrapPythonPrograms diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 7766158193d5..fa1aca4360f2 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.21"; + version = "1.10.23"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qaM1I3ytMZN+5v/Oj47n3Oc21Jk7DtjfWA/xDprbn/M="; + sha256 = "sha256-1fEmtbHKrjuyIVrGr/vTudZ99onkNjEMvyBJt4I8KK4="; }; vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0="; @@ -46,6 +46,9 @@ in buildGoModule rec { "cmd/utils" ]; + # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.23/build/ci.go#L218 + tags = [ "urfave_cli_no_docs" ]; + # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libobjc IOKit ]; @@ -56,6 +59,6 @@ in buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ adisbladis lionello RaghavSood ]; + maintainers = with maintainers; [ adisbladis RaghavSood ]; }; } diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 1289ee7549e1..07eb699afe83 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -31,20 +31,20 @@ let (name: spec: fetchFromGitHub { repo = name; - inherit (spec) owner rev sha256; + inherit (spec) owner rev hash; } ) (lib.importJSON ./deps.json); in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.168.0"; + version = "1.169.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-/06eZ79Zeq6jtcfq+lOcumBgP59bqCX/Km7k21FroSc="; + hash = "sha256-EQAoKft/L4sbdY8hOvyu+Cy+3I8Lt4g1KTxTlSYALac="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 012f504e0ede..910f0163cb29 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -2,56 +2,56 @@ "EncConv": { "owner": "Alexey-T", "rev": "2022.06.19", - "sha256": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" + "hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", "rev": "2022.06.14", - "sha256": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA=" + "hash": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.07.17", - "sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU=" + "rev": "2022.08.28", + "hash": "sha256-jkVHwPQGPtLeSRy502thPIrDWzkkwvlnyGcTzjgFgIc=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.07.27", - "sha256": "sha256-SGozuk0pvp0+PwAFbGG+QMUhQ2A6mXKr31u10WIveh0=" + "rev": "2022.08.28", + "hash": "sha256-U/UD3vPnIdQUe/1g/mKgs5yGirsIB/uHTjD0MOouAyI=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.05.04", - "sha256": "sha256-6O4RijSejPogokLSBuC6pKrOpihMi/ykS06YyV64Sak=" + "rev": "2022.08.28", + "hash": "sha256-/MWC4BoU/4kflvbly0phh+cfIR8rNwgWFtrXnmxk0Ks=" }, "EControl": { "owner": "Alexey-T", - "rev": "2022.07.20", - "sha256": "sha256-pCIt21m34BuDbWLn+CQwqsMQHVWHtctME63Bjx1B9hE=" + "rev": "2022.08.22", + "hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", "rev": "2022.07.20", - "sha256": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU=" + "hash": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU=" }, "Python-for-Lazarus": { "owner": "Alexey-T", "rev": "2021.10.27", - "sha256": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA=" + "hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA=" }, "Emmet-Pascal": { "owner": "Alexey-T", "rev": "2022.01.17", - "sha256": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw=" + "hash": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw=" }, "CudaText-lexers": { "owner": "Alexey-T", "rev": "2021.07.09", - "sha256": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" + "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5", - "sha256": "sha256-Pevh+yhtN3oSSvbQfnO7SM6UHBVe0sSpbK8ss98XqcU=" + "rev": "v11.5.2", + "hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8=" } } diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/applications/editors/cudatext/update.sh index 5cee9d709a0b..36b53ec141be 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/applications/editors/cudatext/update.sh @@ -20,7 +20,7 @@ hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix hash to-sri --type sha256 $hash) sed -i "s#version = \".*\"#version = \"$version\"#" default.nix -sed -i "s#sha256 = \".*\"#sha256 = \"$sriHash\"#" default.nix +sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix while IFS=$'\t' read repo owner rev; do latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name') @@ -28,6 +28,6 @@ while IFS=$'\t' read repo owner rev; do url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix hash to-sri --type sha256 $hash) - jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".sha256 = \"${sriHash}\"" deps.json | sponge deps.json + jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".hash = \"${sriHash}\"" deps.json | sponge deps.json fi done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 19a2e378f30a..d2a0080859da 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { categories = [ "Development" ]; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 - libXrender libXtst libsecret makeWrapper zlib + libXrender libXtst libsecret zlib ] ++ lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix deleted file mode 100644 index e7d673e3391b..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, trivialBuild -, fetchFromGitHub -, emacs -}: - -trivialBuild rec { - pname = "apheleia"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "raxod502"; - repo = pname; - rev = "v${version}"; - hash = "sha256-yd9yhQOs0+RB8RKaXnV/kClDm8cO97RkC8yw5b8IKRo="; - }; - - buildInputs = [ - emacs - ]; - - meta = with lib; { - homepage = "https://github.com/raxod502/apheleia"; - description = "Asynchronous buffer reformat"; - longDescription = '' - Run code formatter on buffer contents without moving point, using RCS - patches and dynamic programming. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres leungbk ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 80fde736ac42..ec3eeaf7fd39 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -162,8 +162,6 @@ # Packages made the classical callPackage way - apheleia = callPackage ./apheleia { }; - ebuild-mode = callPackage ./ebuild-mode { }; evil-markdown = callPackage ./evil-markdown { }; diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 3f9ec25d99f0..acc6833b98c9 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -5,22 +5,14 @@ The list is ordered from more-specific (the user profile) to the least specific (the system profile)" (reverse (split-string (or (getenv "NIX_PROFILES") "")))) -;;; Extend `load-path' to search for elisp files in subdirectories of -;;; all folders in `NIX_PROFILES'. Also search for one level of -;;; subdirectories in these directories to handle multi-file libraries -;;; like `mu4e'.' -(require 'seq) -(let* ((subdirectory-sites (lambda (site-lisp) - (when (file-exists-p site-lisp) - (seq-filter (lambda (f) (file-directory-p (file-truename f))) - ;; Returns all files in `site-lisp', excluding `.' and `..' - (directory-files site-lisp 'full "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)"))))) - (paths (apply #'append - (mapcar (lambda (profile-dir) - (let ((site-lisp (concat profile-dir "/share/emacs/site-lisp/"))) - (cons site-lisp (funcall subdirectory-sites site-lisp)))) - (nix--profile-paths))))) - (setq load-path (append paths load-path))) +;;; Extend `load-path' to search for elisp files in subdirectories of all folders in `NIX_PROFILES'. +;;; Non-Nix distros have similar logic in /usr/share/emacs/site-lisp/subdirs.el. +;;; See https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html +(dolist (profile (nix--profile-paths)) + (let ((default-directory (expand-file-name "share/emacs/site-lisp/" profile))) + (when (file-exists-p default-directory) + (setq load-path (cons default-directory load-path)) + (normal-top-level-add-subdirs-to-load-path)))) ;;; Remove wrapper site-lisp from EMACSLOADPATH so it's not propagated ;;; to any other Emacsen that might be started as subprocesses. diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 7a1c997a7c53..8a6dc4e00730 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -22,7 +22,7 @@ rec { launcher = runCommand "octave-kernel-launcher" { inherit octave; python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 2020729d81c5..3d1f01f4b021 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , rustPlatform +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -16,6 +17,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k="; }; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + install -Dm644 syntax.d/* -t $out/share/kibi/syntax.d + wrapProgram $out/bin/kibi --prefix XDG_DATA_DIRS : "$out/share" + ''; + meta = with lib; { description = "A text editor in ≤1024 lines of code, written in Rust"; homepage = "https://github.com/ilai-deutel/kibi"; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 97c7a2505a5c..14b6bdf2e375 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,3 +1,4 @@ +# run tests by building `neovim.tests` { vimUtils, vim_configurable, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped @@ -66,6 +67,15 @@ let sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; }; + # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex + # the answer is store in `plugin_was_loaded_too_late` in the cwd + texFtplugin = pkgs.runCommandLocal "tex-ftplugin" {} '' + mkdir -p $out/ftplugin + echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' > $out/ftplugin/tex.vim + echo ':q!' >> $out/ftplugin/tex.vim + echo '\documentclass{article}' > $out/main.tex + ''; + # neovim-drv must be a wrapped neovim runTest = neovim-drv: buildCommand: runCommandLocal "test-${neovim-drv.name}" ({ @@ -128,6 +138,25 @@ rec { ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e ''; + nvim_with_ftplugin = neovim.override { + extraName = "-with-ftplugin"; + configure.packages.plugins = with pkgs.vimPlugins; { + start = [ + texFtplugin + ]; + }; + }; + + # regression test that ftplugin files from plugins are loaded before the ftplugin + # files from $VIMRUNTIME + run_nvim_with_ftplugin = runTest nvim_with_ftplugin '' + export HOME=$TMPDIR + ${nvim_with_ftplugin}/bin/nvim ${texFtplugin}/main.tex + result="$(cat plugin_was_loaded_too_late)" + echo $result + [ "$result" = 0 ] + ''; + # check that the vim-doc hook correctly generates the tag # we know for a fact packer has a doc folder diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index cb0c005759b8..2af7ffb43943 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -106,6 +106,7 @@ let flags = [ "--cmd" (lib.intersperse "|" hostProviderViml) "--cmd" "set packpath^=${vimUtils.packDir packDirArgs}" + "--cmd" "set rtp^=${vimUtils.packDir packDirArgs}" ]; in [ diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index eca556fa86a8..e94fb02fcd99 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "pinegrow"; # deactivate auto update, because an old 6.21 version is getting mixed up # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 - version = "6.6"; # nixpkgs-update: no auto update + version = "6.8"; # nixpkgs-update: no auto update src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "sha256-a3SwUNcMXl42+Gy3wjcx/KvVprgFAO0D0lFPohPV3Tk="; + sha256 = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk="; }; nativeBuildInputs = [ @@ -58,16 +58,16 @@ stdenv.mkDerivation rec { # folder and symlinked. unzip -q $src -d $out/opt/pinegrow substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \ - --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"' - mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop - ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow + --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/pinegrow"' + mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/pinegrow.desktop + ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/pinegrow runHook postInstall ''; # GSETTINGS_SCHEMAS_PATH is not set in installPhase preFixup = '' - wrapProgram $out/bin/Pinegrow \ + wrapProgram $out/bin/pinegrow \ ''${makeWrapperArgs[@]} \ ''${gappsWrapperArgs[@]} ''; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 7f34fc6e0726..76762fd927cc 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-nw6LG8U4ne5nngmE7F4yFE8mTEvaRSMfwwOxg2TnAdA="; + hash = "sha256-CwfnRkG8GsRQuE0+l394gMdj5ao3SUKaDnYP2dfUEew="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index d11d638f4a02..c80dcb80949a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -338,7 +338,7 @@ rec { if vimrcFile != null then vimrcFile else if vimrcConfig != null then mkVimrcFile vimrcConfig else throw "at least one of vimrcConfig and vimrcFile must be specified"; - bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } '' + bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } '' vimrc=${lib.escapeShellArg vimrc} gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0097df59ce04..4e5807e80191 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -16,6 +16,7 @@ , racket , clojure-lsp , alejandra +, millet }: let @@ -311,6 +312,26 @@ let }; }; + azdavis.millet = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Millet"; + publisher = "azdavis"; + version = "0.3.5"; + sha256 = "sha256-lQ7EMs6nsTEgP9BESMpyoZG7QVOe7DXzfg/iZr1+DCQ="; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/lang-srv"' package.json | sponge package.json + ''; + meta = with lib; { + description = "Standard ML support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; + license = licenses.mit; + maintainers = with maintainers; [ smasher164 ]; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; @@ -363,8 +384,8 @@ let mktplcRef = { name = "ocaml-formatter"; publisher = "badochov"; - version = "1.14.0"; - sha256 = "sha256-Iekh3vwu8iz53rPRsuu1Fx9iA/A97iMd8cPETWavnyA="; + version = "2.0.5"; + sha256 = "sha256-D04EJButnam/l4aAv1yNbHlTKMb3x1yrS47+9XjpCLI="; }; meta = with lib; { description = "VSCode Extension Formatter for OCaml language"; @@ -523,15 +544,15 @@ let mktplcRef = { name = "path-intellisense"; publisher = "christian-kohler"; - version = "2.8.0"; - sha256 = "sha256-VPzy9o0DeYRkNwTGphC51vzBTNgQwqKg+t7MpGPLahM="; + version = "2.8.1"; + sha256 = "sha256-lTKzMphkGgOG2XWqz3TW2G9sISBc/kG7oXqcIH8l+Mg="; }; meta = with lib; { description = "Visual Studio Code plugin that autocompletes filenames"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; homepage = "https://github.com/ChristianKohler/PathIntellisense"; license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + maintainers = with maintainers; [ imgabe superherointj ]; }; }; @@ -880,8 +901,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.5.0"; - sha256 = "sha256-L/jW6xAnJ8v9Qq+iyQI8usGr8BoICR+2ENAMGQ05r0A="; + version = "9.8.0"; + sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -889,7 +910,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + maintainers = with maintainers; [ datafoo superherointj ]; }; }; @@ -958,6 +979,23 @@ let }; }; + firefox-devtools.vscode-firefox-debug = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-firefox-debug"; + publisher = "firefox-devtools"; + version = "2.9.8"; + sha256 = "sha256-MCL562FPgEfhUM1KH5LMl7BblbjIkQ4UEwB67RlO5Mk="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; + description = "A Visual Studio Code extension for debugging web applications and browser extensions in Firefox"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=firefox-devtools.vscode-firefox-debug"; + homepage = "https://github.com/firefox-devtools/vscode-firefox-debug"; + license = licenses.mit; + maintainers = with maintainers; [ felschr ]; + }; + }; + foam.foam-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "foam-vscode"; @@ -1319,8 +1357,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.9.0"; - sha256 = "sha256-KNfZOrVxK3/rClHPcIyPgE9CRtjkI7NLY0xZ9W+X6OM="; + version = "0.11.0"; + sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1368,8 +1406,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.20"; - sha256 = "16mmivdssjky11gmih7zp99d41m09r0ii43n17d4i6xwivagi9a3"; + version = "0.1.23"; + sha256 = "sha256-64gwwajfgniVzJqgVLK9b8PfkNG5mk1W+qewKL7Dv0Q="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -1377,7 +1415,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ superherointj SuperSandro2000 ]; }; }; @@ -1936,13 +1974,13 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ratsclub ]; + maintainers = with maintainers; [ ratsclub superherointj ]; }; mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.10.4"; - sha256 = "sha256-Qk4wD6gh/xvH6nFBonje4Stz6Y6yaIyxx1TdAXQEycM="; + version = "1.10.7"; + sha256 = "sha256-BxVur+aSbFPyX+DW9tQcfJEyImkbTC6O0uOV2d76au0="; }; }; @@ -1990,8 +2028,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "4.1.0"; - sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI="; + version = "4.2.0"; + sha256 = "sha256-1U3JlWfIlTt0AMPsiP3vD2ZEzD2oUsYsqRRwBQeoLIA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -2300,11 +2338,16 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.3.0"; - sha256 = "11plqsj3c4dv0xg2d76pxrcn382qr9wbh1lhln2x8mzv840icvwr"; + version = "105.21.0"; + sha256 = "12p6msv8wi773piqm1y5zik3ky652bdaw9s83ffwnlndsh87s9n5"; }; meta = { + changelog = "https://github.com/sveltejs/language-tools/releases"; + description = "Svelte language support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode"; + homepage = "https://github.com/sveltejs/language-tools#readme"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fabianhauser ]; }; }; diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 338c64a24b81..5b111b80285a 100644 --- a/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix @@ -6,11 +6,10 @@ let pkg = import ./base.nix { pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool + buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { - nativeBuildInputs = [ gobject-introspection cmake ]; + nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; postFixup = '' wrapProgram $out/bin/image-analyzer \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/pkgs/applications/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix index 9464bde70bf7..994a0f0e03da 100644 --- a/pkgs/applications/emulators/cdemu/base.nix +++ b/pkgs/applications/emulators/cdemu/base.nix @@ -1,12 +1,12 @@ { pname, version, pkgSha256 }: -{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: +attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }: stdenv.mkDerivation ( rec { inherit pname version buildInputs; src = fetchurl { url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz"; sha256 = pkgSha256; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ]; setSourceRoot = '' mkdir build cd build diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix index 06604e3eae99..2e301a115c9a 100644 --- a/pkgs/applications/emulators/cdemu/client.nix +++ b/pkgs/applications/emulators/cdemu/client.nix @@ -5,8 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7"; }; in callPackage pkg { - buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 - intltool makeWrapper ]; + nativeBuildInputs = [ makeWrapper intltool ]; + buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ]; drvParams = { postFixup = '' wrapProgram $out/bin/cdemu \ diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 3df9e4ad5437..5d376955ea66 100644 --- a/pkgs/applications/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix @@ -5,5 +5,6 @@ let pkg = import ./base.nix { pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d"; }; in callPackage pkg { - buildInputs = [ glib libao libmirage intltool ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ glib libao libmirage ]; } diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index 15e595a61729..3083e1960b5d 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -8,10 +8,9 @@ let }; inherit (python3Packages) python pygobject3; in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; + buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { - nativeBuildInputs = [ gobject-introspection cmake ]; + nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 7016a42d247b..b631d3669dc9 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -8,11 +8,11 @@ let pkg = import ./base.nix { pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm"; }; in callPackage pkg { - buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ]; + buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ]; drvParams = { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - nativeBuildInputs = [ cmake gobject-introspection pkg-config ]; + nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; }; } diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 6838a7baaf2a..d1fd26bfeaf9 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.14.7"; + version = "0.15.4"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-rvcR1mp+lJ6ZFc9WYUK9FBVcG2vD5MoX6lY+AJsMaeQ="; + sha256 = "sha256-YLWo6Em/NdU60Dtu4ePANSKLixozxpxVwD3dJcAOs3g="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 59466f034634..52f087b9db4d 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ak2tZTNNKsHGNpxobi8oqnimhsNvoaW75zMYBeskXZU="; + sha256 = "sha256-7nMAaMLFLF5WuWgac9wdIvzRTTVpKRM7zB2tIlowBEE="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index eed48c4a7d77..85c372f00406 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -8,6 +8,7 @@ , ncurses , readline , which +, musl-fts # options , conf ? null , withIcons ? false @@ -33,7 +34,10 @@ stdenv.mkDerivation rec { preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; - buildInputs = [ readline ncurses ]; + buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional withIcons [ "O_ICONS=1" ] diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8ec293e489a7..8cc7caee6743 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite - readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas + readline ffmpeg netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid zstd wrapGAppsHook ] ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ] ++ lib.optional stdenv.isDarwin wxmac diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5444bbc0bd41..256bdc329e2a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-46"; + version = "7.1.0-47"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-yts86tQMPgdF9Zk1vljVza21mlx1g3XcoHjvtsMoZhA="; + hash = "sha256-x5kC9nd38KgSpzJX3y6h2iBnte+UHrfZnbkRD/Dgqi8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index fd7ff0216242..a7ae37dbc0c4 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -35,7 +35,7 @@ bundlerApp { exes = [ "image_optim" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/image_optim \ diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index c752d7e3f718..f1757d51b1b3 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/timelapse-deflicker --set PERL5LIB $PERL5LIB ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ - makeWrapper perl + perl ImageMagick TermProgressBar ImageExifTool FileType ClassMethodMaker ]; diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index e77acfb68e4d..38247e28a1bf 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.29.2"; - sha256 = "sha256-Ba3xy2hbU6Gq/TeLnNxSkJga8CqHNyqSgx2ZrFhThL4="; + humioCtlVersion = "0.30.0"; + sha256 = "sha256-BwpnqaUZvttGRtsZT2xcyXfMJZ7EIsKenTPF669ktQM="; vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index dea179f3c34a..33829ff12e2f 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-Umbe3XoCQV+q37ROeIWQUZtTe1Nu59Z5Hxt2nc7/l64="; + sha256 = "sha256-cOryo70eJj2PIJ6R09Kx6lfoguYcduIiWiOBpYp8eqY="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 84b8fe1d17fe..d82518e05619 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.17.5"; + version = "0.18.3"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-FCt/4JCL7VmD26HH1XLjJeUP8m7uexdPekD414CxGDI="; + sha256 = "sha256-GUN/TgAlIl9/libhA+qqYDYHhc1ZDvDymR/Ac8Mev3c="; }; - cargoSha256 = "sha256-S2BVulU2bsgJpxKEt8u2ddNav8/1fd+s7wTVkSeHL4o="; + cargoSha256 = "sha256-u6C19QA3gMzBZIRoNDnfu1p8zkirSQKjNSQrSb8+qvs="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 64787f34a1b0..732ec9eee1e5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-edmg3LU3nQ1fWSb2jDE2kaOZ98pchm3exO/PuethTMU="; + sha256 = "sha256-7DQJiwszE+qGcyyOZd9Zzg9PPc79HTYk8knI7upduts="; }; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 65a74c4aca48..285c5270948d 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff - librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript makeWrapper ]; + librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript ]; # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index a8cb0f215c64..7d8153a487dd 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.32"; + version = "6.4.33"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-PudERmVgatBvtfexX5HjFzuEW8mLZGsaRRSkaqSLcig="; + sha256 = "sha256-gpVOvSbHeQZGPOIK3KRcvPgGiVdEHheUG9MFKlwVQy4="; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index d697e8412adc..421f98b1fb62 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -13,14 +13,16 @@ , tllist , fcft , enableCairo ? true -, withPNGBackend ? "libpng" -, withSVGBackend ? "librsvg" - # Optional dependencies +, svgSupport ? true +, pngSupport ? true +# Optional dependencies , cairo , librsvg , libpng }: +assert svgSupport -> enableCairo; + stdenv.mkDerivation rec { pname = "fuzzel"; version = "1.7.0"; @@ -49,19 +51,17 @@ stdenv.mkDerivation rec { tllist fcft ] ++ lib.optional enableCairo cairo - ++ lib.optional (withPNGBackend == "libpng") libpng - ++ lib.optional (withSVGBackend == "librsvg") librsvg; + ++ lib.optional pngSupport libpng + ++ lib.optional svgSupport librsvg; mesonBuildType = "release"; mesonFlags = [ "-Denable-cairo=${if enableCairo then "enabled" else "disabled"}" - "-Dpng-backend=${withPNGBackend}" - "-Dsvg-backend=${withSVGBackend}" + "-Dpng-backend=${if pngSupport then "libpng" else "none"}" + "-Dsvg-backend=${if svgSupport then "librsvg" else "none"}" ]; - CFLAGS = "-Wno-error=comment"; # https://gitlab.gnome.org/GNOME/librsvg/-/issues/856 - meta = with lib; { description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 9801d17d5bf7..91a30ec5d57b 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.22.4"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dJbzhZQIaMBXVd2r40F/fZfokkSq8pVSsRrymxrIynk="; + sha256 = "sha256-cGLtz5UPTIp0WfChKWdnrD4C+mGv+d83eHRrzpD7MIs="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index ebd8f0a175a8..3f77b890455b 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -7,7 +7,7 @@ bundlerApp rec { inherit ruby; gemdir = ./.; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru.updateScript = bundlerUpdateScript "gollum"; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 04e314e795e7..913b3a229769 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-rxvfBgbMVKNiv+F2fyqcieGamTUwFKScEky918oU8lc="; + sha256 = "sha256-GQf5S7mYuucJS5jsz0upe6DiniY8YXZXYQV7nyrjVmE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 390f756beb10..a446c37aeacb 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.5-31be26f1/Hubstaff-1.6.5-31be26f1.sh"; - version = "1.6.5-31be26f1"; - sha256 = "1z1binnqppyxavmjg0l1cvy64ylzy2v454sws2x1am2qhhbnycjm"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.6-61e2338c/Hubstaff-1.6.6-61e2338c.sh"; + version = "1.6.6-61e2338c"; + sha256 = "0i5wxwnrgabirk1x9aii7m428dkr745sfm1lcql4yhlqx4mw6qn1"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index af7e9888c17c..09f9b85e4b71 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext + TimeDate gettext DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) ++ lib.optionals docutilsSupport [ diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 0fd6e72a57ec..68ca556aac63 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8="; + sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; }; - cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A="; + cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 8c25e3774b14..7ea488659f26 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -30,7 +30,7 @@ in bundlerApp { then ./full else ./basic; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 9ed678173473..3ab41da35452 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.27.8"; + version = "0.27.11"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-t/nd7m8XpB026q/kyH16rKkw3qza19ISalB0Juzx4NU="; + hash = "sha256-w3ag+TPUrjPbPIy6N4HPsfraOyoHqBbvjwB1M6+qh60="; }; postPatch = '' diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 7eee1fb85af6..1735b89cef13 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-sJ0zaP3zhmcFKK97Bhist98xDuC/jpoN/5Vp1FIWp5M="; + sha256 = "sha256-kUBSoNs9pKnAC4OKFuvtHb0sLxNCsNOosXesMULcpgc="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index e736c235c457..d1a19eeccc5e 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -12,10 +12,10 @@ mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ qtbase qtsvg python3 file/*for libmagic*/ bc - hunspell makeWrapper # enchant + hunspell # enchant ]; configureFlags = [ diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 820eceabb511..17377c6dae55 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -24,11 +24,10 @@ in stdenv.mkDerivation rec { preConfigure = "./autogen.sh --libexecdir=$(out)/bin"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper libtool ]; buildInputs = [ - glib libwnck libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib gsettings-desktop-schemas gnome.gnome-common - libtool ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 005d0273466c..9c0c5a3921ef 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - glib libwnck libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib gsettings-desktop-schemas ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index f15279ff4393..ff0127c106e7 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w="; + sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; }; vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index daa1441ffc53..c38ee194b4e2 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_17 +, electron_18 , makeDesktopItem , graphicsmagick , writeScript @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_17}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 6f858c8c6a9d..7797b6dccac0 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + makeWrapper ]; buildInputs = [ cairo glib libnotify - makeWrapper rofi-unwrapped wl-clipboard xclip diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 8d929e0eef58..f973cf591593 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; + nativeBuildInputs = [ makeWrapper which ]; buildInputs = [boost] ++ - (with perlPackages; [ perl makeWrapper which + (with perlPackages; [ perl EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 0b0163b054d7..ebd266e66698 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-IWHj//ZZOdfOCBJHnPnKNoYNtWl/f8H6ARYe1AkqB0U="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; dontBuild = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1cfc90dd4f14..1bad824b4e59 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -289,6 +289,10 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "105") { + # https://bugs.chromium.org/p/chromium/issues/detail?id=1334390: + use_system_libwayland = false; + use_system_wayland_scanner = false; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 1b149daa8ba2..82af5098c64a 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "103.0.2-1", + "packageVersion": "104.0-1", "source": { - "rev": "103.0.2-1", - "sha256": "0cfhrxnvxlidipg0cpz0gapya8pvfqcmjkyqns4xz1jq5lkm1xg3" + "rev": "104.0-1", + "sha256": "0fvbpiaabcr1j39zc3xz1czah537s8abidwch5a75phxn676np2k" }, "firefox": { - "version": "103.0.2", - "sha512": "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a" + "version": "104.0", + "sha512": "8778650ffa3c2d18802c348e27789f00cff143c7ca0ae01b1bcd050b6942c149db25696b48f3c702fbde901c15fcae976ac731a456f641637cae3eb56d0077d3" } } diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 8f6d2712caaf..cb11708fbee0 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; }; - buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = otherDependencies ++ pythonDependencies; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 1e5e8ab74970..0ae2d3b35884 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.7.1"; + version = "2022.8.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-kc6+jn4eTCw37u+kPJdx/kxiaj8MnIddDbUFpPfWdlw="; + hash = "sha256-Kyt5d3KmLefTVVUmUUU23UV0lghzhLFCKLlmwTjN68I="; }; vendorSha256 = null; - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" ]; preCheck = '' # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://www.cloudflare.com/products/tunnel"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bbigras enorris thoughtpolice techknowlogick ]; + maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; } diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index b71c0b50c1da..8e3b21c513d7 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.34"; + version = "0.8.36"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-nGAR+CYVE2acXRRJCl6nWTrjpbX6HArsys9Df8D/hEE="; + sha256 = "sha256-+666KfOK2yxkADw+EvKlXAAsz2Aw+EmRXGAqNMfBsj8="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 65f3313bcc7a..eb51cf14dadb 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WCOZuHJBssRM75+EO9s11t7ASkLxHbsVe+qmb/glFWU="; + sha256 = "sha256-LayPASPMSnRZkDs9LylWR62eS+b/5TB9PidDQCs+MXU="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5db28a0ac859..fced7bcd87af 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.7"; + version = "1.12.9"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-GFexXy/vH8rbtoxGo0Sy6cO+FxLTGaO67BkBPgaHuws="; + hash = "sha256-FSZTonoMojBsp+6K4gID2X92wcOE009hTPNqONxRbps="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index cab22babbcf4..3bedb0195248 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.0"; + version = "0.12.3"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-sb0cVLPIRD49AQ2XUsXkABFEZPrcuytr8Ht7Zt40H3o="; + sha256 = "sha256-2S/VnxVb056aPxFd5LxtUdaNlosHLlu7Tl/RQbY/zpA="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; - vendorSha256 = "sha256-I2bODrGF4D7B13qBZtCAOWgAmrxdleqfDQz+vCGmdjQ="; + vendorSha256 = "sha256-97m8xz46lvTtZoxO2+pjWmZyZnB2atPuVzYgS9DV+gI="; postConfigure = '' substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \ diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 4bf05a7e1e12..2b9384478810 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-ekojX7gl8wC7GlHG3Y+dwry7jxjIm5dbS7cNN1xu4kY="; + sha256 = "sha256-IJ/QKqGhhJfqRBVKfmV4jTC2C53DmzmK5AECJg2xdmw="; }; - vendorSha256 = "sha256-dPdF3qTrYRbKUepgo6WVIVyGnaWxhQ0371fzXlBD8rE="; + vendorSha256 = "sha256-kmUhcHZ6LcxtuuucOwcO6TNk2TsWL6lcppD6M6unY2M="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 137ae8287afc..4d915252637d 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-mqkkPqun0m4y/qFUWVTRCtqZd3j6jDw6Ua8hRQ41G38="; + sha256 = "sha256-+5g51doZBJqNwsIvAZ7rsq6QhAMaWFjygzr+eAE+R8w="; }; - vendorSha256 = "sha256-geelFhThdcqQ0iBzmYb5SlxPatFYDmN042O8YY5AhS0="; + vendorSha256 = "sha256-YC4ZSeObkilNvAu3StMDrnZQexVUFwVtX7ee/EPLTsE="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 81abb6f50203..f240550d115a 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-Lx+ae0Eb8iVKurXpsb3NPTFrh59vxxf4fA18o1JTIv0="; + sha256 = "sha256-lxfDbsBldMuF++Bb7rXsz+etLC78nTmWAaGbs6mcnBo="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index fed35f12bedc..83d75d7d189a 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.11.2"; - sha256 = "sha256-6FlOHnOmqZ2jqx9qFMPA5jkxBaNqzeCwsepwXR1Imss="; - vendorSha256 = "sha256-wM5qIjabg9ICJcLi8QV9P4G4E7Rn3ctVCqdm2GO8RyU="; + version = "2.12.0"; + sha256 = "0p8k5c0gzpmqp7qrhfcjrhbgwd2mzsn2qpsv7ym0ywjkvrkg3355"; + vendorSha256 = "sha256-qjXpzS1ctEQfXFjzyBUiIp6+oqABedpwHqDxQz0DJ8U="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4d3c30e33375..1ad1a56896b8 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "22.6.1"; - sha256 = "sha256-YM6d2bWcjoNMEbgXVR79tcklTRqAhzm6SzJU2k+7BNU="; - vendorSha256 = "sha256-i+AbrzN9d9CGZcGj/D4xnYlamp0iOlq2xcax14/GqEE="; + version = "22.8.2"; + sha256 = "114lfq5d5b09zg14iwnmaf0vmm183xr37q7b4bj3m8zbzhpbk7xx"; + vendorSha256 = "sha256-hKdokt5QW50oc2z8UFMq78DRWpwPlL5tSf2F0rQNEQ8="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 7722a7109c21..80150b45d866 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -53,6 +53,6 @@ buildGoModule rec { downloadPage = "https://github.com/linkerd/linkerd2/"; homepage = "https://linkerd.io/"; license = licenses.asl20; - maintainers = with maintainers; [ Gonzih bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 Gonzih superherointj ]; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 937d41a79423..0e5be4f197e1 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -7,7 +7,7 @@ cd $(dirname "$0") VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ --silent https://api.github.com/repos/linkerd/linkerd2/releases | \ - jq 'map(.tag_name)' | grep edge | sed 's/["|,| ]//g' | sed 's/edge-//' | sort -V -r | head -n1) + jq 'map(.tag_name)' | grep -v -e '-rc' | grep edge | sed 's/["|,| ]//g' | sed 's/edge-//' | sort -V -r | head -n1) SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/edge-${VERSION}.tar.gz) diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 5ec96af796c0..19aa4274bed3 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -7,7 +7,7 @@ cd $(dirname "$0") VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ --silent https://api.github.com/repos/linkerd/linkerd2/releases | \ - jq 'map(.tag_name)' | grep stable | sed 's/["|,| ]//g' | sed 's/stable-//' | sort -V -r | head -n1) + jq 'map(.tag_name)' | grep -v -e '-rc' | grep stable | sed 's/["|,| ]//g' | sed 's/stable-//' | sort -V -r | head -n1) SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/stable-${VERSION}.tar.gz) diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 4297ec62376d..b90660199e28 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.7.0"; + version = "5.10.5"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-/H8/wpDqlo96qb6QBIxpIGMv6VtK/nn/GwozIJjZyNY="; + sha256 = "sha256-Pdw8xPpH9PjLDbno8u3IWI7ygO18j2P3puE55+Pmzec="; }; - vendorSha256 = "sha256-jPVlHyKZ1ygF08OypXOMzHBfb2z5mhg5B8zJmAcQbLk="; + vendorSha256 = "sha256-hAnlKMDqrQG8vlmBLufJlq79rb1vo4PdVaJjBBSjnRM="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 4b935027d2e2..fa6976d5a3f7 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "51c79060fc1433233eb43842de564f0f2e47be86"; +let rev = "551bf68c694927839c3add25a2512f880902ee9b"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.4"; # Do not forget to update `rev` above + version = "0.56.10"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-6kHqfWDrZL3J5SrZ3JK50Z2Sw8mwM0zrfaKWo22g27A="; + sha256 = "sha256-Hykm8h0kJzTL6XbaBe3vtoghmP4LmvPfBhrTgCmNyRE="; }; - vendorSha256 = "sha256-8n4a1PLUYDU46lVegQoOCmmRSR1XfnjgEGZ+R5f36Ic="; + vendorSha256 = "sha256-jBm3t/kvijAv5KOLhDJ1kGLdzpFJiBs/Vtu2mO2lnPM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 9dc32d67dff6..c39d2893f940 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.4"; + version = "0.15.8"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GhcHvKqYktBAPB443ZjJ3LYRJZorO7IH1OEnEQKUO0g="; + sha256 = "sha256-AgAcN1KtMW7yHi12Gg1M3hu7DQA7WdWtY3qf4K7c1YA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-ozbejIFR0mDgCgca+2yaPRiMMHLOEsC9u+kQUe69spc="; + vendorSha256 = "sha256-aQrKppIJOCTIDrKvtE6WTkQY8mfYzUh7mBKUd6z19E0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8fdb2642cc51..5eeb204a5b6e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -41,20 +41,20 @@ "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v2.2.0", - "sha256": "sha256-OhHzFRxOmJR2NW1UX38+ep/VmmZ9xfPqwUo/37/hGyU=", - "vendorSha256": "sha256-rhA0Mm+Uu+F8zyRLj4fRED+pJ0TpZvVSFKvmm0OAhPY=", - "version": "2.2.0" + "rev": "v2.3.0", + "sha256": "sha256-rUVSXaxC71nb32o2zShm9/SoUN+UoD2CQadifZWXWR8=", + "vendorSha256": "sha256-lqoPXrnihdewqyByfl2y6mH3AHlELz2ZIdIE7v/ljrE=", + "version": "2.3.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.181.0", - "sha256": "sha256-zJagnn/nfueGwevgQaaiB5Y3DF6214JPa/fD/XctLHU=", + "rev": "v1.182.0", + "sha256": "sha256-syxmCEvNRUsVl4B9OuClKztlr9hqKIHTpeppcNPUJog=", "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=", - "version": "1.181.0" + "version": "1.182.0" }, "ansible": { "owner": "nbering", @@ -78,10 +78,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.35.0", - "sha256": "sha256-deXywsZkAms/T0j4YT4WmTvHPB4AUet4tDETYtRQOQo=", - "vendorSha256": "sha256-u1tBA/uWqWa2j2094zHNPinzOJ9ogwMNwsF6QSfnOy0=", - "version": "0.35.0" + "rev": "v0.36.0", + "sha256": "sha256-nKF5K+62Fc6MIrF7GagzLyp15aBpMKox6ZTS5csBfAU=", + "vendorSha256": "sha256-HNHW6ePs1qbwPiU0Xc2AwWmsSqr7mWI7xtMvL9GW7L8=", + "version": "0.36.0" }, "avi": { "owner": "vmware", @@ -105,28 +105,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.27.0", - "sha256": "sha256-JqGRfuc7vyZK0xfkLhtNwGn6fEO6Cgbch98gSiPaypU=", - "vendorSha256": "sha256-ccvj/uEAcH6zNfWU0NriQXgEPBndoXC9hPX/RHjpc1I=", - "version": "4.27.0" + "rev": "v4.28.0", + "sha256": "sha256-35z4a2pOoL78wGgfiKBjUXa4NORQNgPNgirHLX0N4gY=", + "vendorSha256": "sha256-XlTrAj7LRFWse80KgMRGUnGNi0ri6XwAi1cuEqKqrBg=", + "version": "4.28.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.27.0", - "sha256": "sha256-E8O0+OblKl1aSOXB5fnc34m+pUsfIZ6eHWoAq6HkKHs=", + "rev": "v2.28.0", + "sha256": "sha256-4GEoJJoMi1gCdhrqb5IsPb2haht4vH1hyJx7Z4rin00=", "vendorSha256": null, - "version": "2.27.0" + "version": "2.28.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.19.1", - "sha256": "sha256-ESQZpljRxGd+F0ki5uJ7B0LEFSWWrcr3kXGBPLWL75U=", + "rev": "v3.20.0", + "sha256": "sha256-CaiEFJrtcro3taVXpsHoe5vvXjUaLn+7d72V+5UmNtg=", "vendorSha256": null, - "version": "3.19.1" + "version": "3.20.0" }, "azurestack": { "owner": "hashicorp", @@ -142,10 +142,10 @@ "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.14.5", - "sha256": "sha256-fZOPtfAA1lXb6kf9oZnPeL5+spriEDhVCimFOVTyOsw=", - "vendorSha256": "sha256-p5xloe5ixgpoD7rPRiO9cNLm3Tmlk7pEJT+xXOZWA6o=", - "version": "1.14.5" + "rev": "v1.15.0", + "sha256": "sha256-U5EvN13fKzpeWHSEwgxiESrXCQ0KS9R2HZ7XTrj10pc=", + "vendorSha256": "sha256-dgcYdfManE48sYaRRMfYMxQ4qX4uqas0yx+bn60kPWU=", + "version": "1.15.0" }, "bigip": { "owner": "F5Networks", @@ -160,10 +160,10 @@ "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.20.0", - "sha256": "sha256-8GWxUb7ABulZ6jK9PATYfSbcyTCZ5Mqv3X3zjY3gquU=", - "vendorSha256": "sha256-h/hm5HtY3OCJ6Mtq+A3PBmH10xgYpKwjhwbDd1HtdoQ=", - "version": "2.20.0" + "rev": "v2.21.2", + "sha256": "sha256-arNkR67rsqxVV2omEV9MWQmDO95PLuoVicifLjEfBTM=", + "vendorSha256": "sha256-UQw7+qsxVff9EtWTpAaBkBm0bOQzerfCGx1SUKS9wEQ=", + "version": "2.21.2" }, "brightbox": { "owner": "brightbox", @@ -225,10 +225,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.21.0", - "sha256": "sha256-qyF3FIDMr+kqx60x7LE/bDwH7tj4zSaASv8ApaxPATI=", - "vendorSha256": "sha256-5tJSdXmQto4c5On3mGca1Hji0sg5KtJXvYdbiObCC48=", - "version": "3.21.0" + "rev": "v3.22.0", + "sha256": "sha256-K+0S7WSGP/9is7Q89aOPmSfFWZE9InBaS+KfhJKvNYk=", + "vendorSha256": "sha256-OuGc2msPWjczyv2XR8HESAdJd1Ovz0BihI/j6pdd9QY=", + "version": "3.22.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -426,39 +426,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.29.0", - "sha256": "sha256-on43tlkPxtQFwjbr5zOvzgO8RfcGc8XbUXZURa81Kkc=", + "rev": "v4.30.0", + "sha256": "sha256-yLEh0RLDStle7K4hXYgsKIEYuZ5nwrY5dR574yRjRLw=", "vendorSha256": null, - "version": "4.29.0" + "version": "4.30.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.16.1", - "sha256": "sha256-sPcgnlczDc0YoNnFgCd0uETLgEhP5n5Al59HtIGGdf4=", - "vendorSha256": "sha256-5OXllLq5VjFpay2vVEXczqvSmgLeAQ66fXqYf+eDJOI=", - "version": "3.16.1" + "rev": "v3.17.0", + "sha256": "sha256-jVBkrWwBWcRtyfq3Wt9fxoO6OewtYi0vw127iL1/ZJA=", + "vendorSha256": "sha256-0jzM/CvUKz8QECmMHfFirJxBRP8db+mhQxIQ5dTrlNM=", + "version": "3.17.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.32.0", - "sha256": "sha256-idekFsYnrQ4wHjAIPlZn8dSEqOP9KWQvaqImIN/mJA8=", + "rev": "v4.33.0", + "sha256": "sha256-6mWSlTIVvbz7lid2+2T//vQf45ZNAEvD30qYG2Wd9yg=", "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", - "version": "4.32.0" + "version": "4.33.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.32.0", - "sha256": "sha256-9iYS8lc4+QPnwMMscU/5mcDlaQrKV8Srhn9o64hZq6k=", + "rev": "v4.33.0", + "sha256": "sha256-PoNacRcv+w7ydIPkuvfOhSjvdgYAahdKOI5yBoD9tu0=", "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", - "version": "4.32.0" + "version": "4.33.0" }, "googleworkspace": { "owner": "hashicorp", @@ -473,10 +473,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.25.0", - "sha256": "sha256-KB2GTz8Sq9H1MVPaU5qaDhP4NytdQocO4AYO7zoihJc=", - "vendorSha256": "sha256-uRsuw2JgKjbCQSodNdufR+vZSD+NI0HgxvWg6p4hUgQ=", - "version": "1.25.0" + "rev": "v1.27.0", + "sha256": "sha256-ED97aYj71Zw89QCn19u4XP5pvfElKrQhFl3ESCYcafg=", + "vendorSha256": "sha256-UFtjicPL8Dg5dxi5vjCmvD1egZnODmsXSUCx0q5TyZw=", + "version": "1.27.0" }, "gridscale": { "owner": "gridscale", @@ -545,10 +545,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.39.0", - "sha256": "sha256-ckjCINqaW8taEzmBEjje3s15OmaAi9LWcSd7vgJyDug=", + "rev": "v1.40.0", + "sha256": "sha256-2wwwEWChYJNbeonxBg/M6fSVcoHKup3z/sQ93iZd2hc=", "vendorSha256": null, - "version": "1.39.0" + "version": "1.40.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -644,19 +644,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.12.1", - "sha256": "sha256-wswBD4XqtHZsg8vhxIqtjZkXNhFLu/nHUCJDW/24dbQ=", + "rev": "v2.13.0", + "sha256": "sha256-QBuYxfuH4Fd/B3CBa6Rp7TujwgyfVaausctAYlEnJ1U=", "vendorSha256": null, - "version": "2.12.1" + "version": "2.13.0" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.0", - "sha256": "sha256-/9J0c79zm3s0i1Um+w+etlpsd37svtovqmBXnGZ1tog=", + "rev": "v2.9.1", + "sha256": "sha256-y6rikCql7zt/Dwo6FLHR/MdnhdA/ZDEVdsYRza4+daE=", "vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.0" + "version": "2.9.1" }, "libvirt": { "owner": "dmacvicar", @@ -780,10 +780,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.49.1", - "sha256": "sha256-+jjMdBj8yEJBA9etiRo3qu+/KfpOe3Gb2DqCR8YPzPI=", - "vendorSha256": "sha256-iIArzW/r57OCtq/lNaFCvQrrGJ8WPHo4md+JrHdMyGs=", - "version": "2.49.1" + "rev": "v3.0.0", + "sha256": "sha256-u2wOmdk9QH1husFTW1Fb3VW2+gFrjerqBL7sOwFUKkw=", + "vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=", + "version": "3.0.0" }, "nomad": { "owner": "hashicorp", @@ -835,19 +835,19 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.89.0", - "sha256": "sha256-D+vPeiCH1T5kdrO+MJ25TIZnx0Fz9f0yAfBV4v0UCRw=", + "rev": "v4.90.0", + "sha256": "sha256-IbYldkApgE+wuSEpDnF7YeRfonjWQfBNskd++bPvPeA=", "vendorSha256": null, - "version": "4.89.0" + "version": "4.90.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.34.0", - "sha256": "sha256-q3e2vRFuBvdjCZ1kONmWOnAI1bM6g+3evCI4CiW9PIQ=", - "vendorSha256": "sha256-pCtE9zGIYBh+GKfMp+28IQD/FSerdCQfpbCw3sXCyeI=", - "version": "3.34.0" + "rev": "v3.35.0", + "sha256": "sha256-4L7BbEWyDhi+QYVGhoTvV4sC6zNpQwEKN5GyPo6eMl4=", + "vendorSha256": "sha256-YgDzQ8601ODl7BWMkMJTcUcaidcKFpfREUzMYGvwn1Y=", + "version": "3.35.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -907,10 +907,10 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.0", - "sha256": "sha256-U3lmGvkqNtSsX60qO+6ZBIlSay6w5FCcqR7yhzu6Nw4=", + "rev": "v2.6.1", + "sha256": "sha256-yBnxzXPNhibBx+p8od0IUQb9gdIQpgZk+9HEjcoe4fQ=", "vendorSha256": null, - "version": "2.6.0" + "version": "2.6.1" }, "panos": { "owner": "PaloAltoNetworks", @@ -952,10 +952,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", - "rev": "v1.6.0", - "sha256": "sha256-gtqH+/Yg5dCovdDlg/JrDqOKfxTKPwfCvnV8MUAjLGs=", - "vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=", - "version": "1.6.0" + "rev": "v1.7.0", + "sha256": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", + "vendorSha256": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=", + "version": "1.7.0" }, "rancher2": { "owner": "rancher", @@ -997,10 +997,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.7", - "sha256": "sha256-W100EYLKaFH9KGmSkgk0Ig2Z0R+RvYijrm3ikhEvBe8=", - "vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=", - "version": "2.2.7" + "rev": "v2.2.8", + "sha256": "sha256-UzgXZhVlPel6CQpMAQP2ca7/ur+y8ADkcF2q7pN+sfM=", + "vendorSha256": "sha256-Jg1FalV+WsKYOZpszeNYydP4Qtf2cdaZt7xz4O699wc=", + "version": "2.2.8" }, "secret": { "owner": "numtide", @@ -1042,10 +1042,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.15.0", - "sha256": "sha256-uosY3WsLtGmQeb0KxNo1GcmFO7SpHI6aZTqM3QJcV0Y=", + "rev": "v6.16.0", + "sha256": "sha256-Q9H1tefQAkbE9lqRzdkziQ5tAbNZ3k5AylD2G9zidU8=", "vendorSha256": "sha256-hxYQF1sZOS5x6sZtUJg13A6SPZG6Ql20vAs8VDQegqQ=", - "version": "6.15.0" + "version": "6.16.0" }, "skytap": { "owner": "skytap", @@ -1060,10 +1060,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.41.0", - "sha256": "sha256-tN7Uryhy5qiIhlT68zaDlKzZUGbMGnGc2D9WebrzVfA=", - "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", - "version": "0.41.0" + "rev": "v0.42.1", + "sha256": "sha256-/qQSMSF4Uxs5ZJj3S1LATs1Uima/FmXVMf41x8K2bQ8=", + "vendorSha256": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=", + "version": "0.42.1" }, "sops": { "owner": "carlpett", @@ -1114,19 +1114,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.77.3", - "sha256": "sha256-OHE8o4KJ2dsSS/Erl7MrRrAl8DTIxotEg69S9fuh7iY=", + "rev": "v1.77.4", + "sha256": "sha256-RkrWJ16fouiINR8+6wW0BBV7lpGu/s32UYPSOUgVLl4=", "vendorSha256": null, - "version": "1.77.3" + "version": "1.77.4" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.36.0", - "sha256": "sha256-xMIrEkjcYkM/LXdu/0gNX6iMJKZhGs9z2vQBbDHdelo=", - "vendorSha256": "sha256-ck6H22N5IXJVa0KeXM0Ntv+16l97v8GaT7xfGme57QE=", - "version": "0.36.0" + "rev": "v0.36.1", + "sha256": "sha256-DRbJ1ZmYMkEncZHE12uLcNHhbSnxvyG3IYqlUsxs+pI=", + "vendorSha256": "sha256-KLae79G6owcJiSxSBKRJX3U0cw9vnihnCs0SjRoIn7Y=", + "version": "0.36.1" }, "thunder": { "owner": "a10networks", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ef43c5986503..058ea43b79bf 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.38.7"; + version = "0.38.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MPetGR/VAVSLuDHyYeP1s9+4RRZzKanf9xyxas3heYY="; + sha256 = "sha256-iTKENFFST7nTsMe7KULGc/WnKrHSXRTWPm2DT5LJC00="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 4f94cc253a83..1b048fb2df9d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.164"; + version = "1.2.165"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-qRw3cH0UNg1PyNZfiVSAX0WJsPw17KNsJ1TnBlySI94="; + sha256 = "sha256-YL3hdWUmt6v58ObnVNhILtM/DSqNlFcaODhNxzPyF0o="; }; vendorSha256 = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index a740153be81b..4493871a6ae7 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bP9tksdP/hNjC4opACLYHad8jj137+WQfb3bM8A6tVQ="; + sha256 = "sha256-jBpapZIQGYC63SEc4kT6pEbNR3H1IQFM7P/wxMlrP8I="; }; - vendorSha256 = "sha256-/lFH/4fQgK0LAqLIn39r+hi0pqNlJuupWlLhOhDh0TU="; + vendorSha256 = "sha256-iY4Q1P4Mir6idcv88Op5v0kQ7PkoOm85aCBb845xvGs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index f602bab27e8a..ffbf42715f53 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { outputs = [ "out" "nautilusExtension" ]; src = fetchurl { - url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2"; + url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k"; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 95afcfae4f2b..79c929401185 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -24,13 +24,13 @@ , libvpx }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.6.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-9mc1Beo7/iNhDXSDC/jiTL+lJRt8ah/1xF1heoHTE+g="; + sha256 = "sha256-YcXLRhW7PyvK0R1+7DOjmtxg+Ajq9u7fvZFQO7DJapQ="; }; postPatch = '' patchShebangs modules/ctrl_dbus/gen.sh diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 9a6cf2d03580..c332126c25f3 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -61,13 +61,13 @@ }: stdenv.mkDerivation rec { - version = "5.9.18"; + version = "5.14.14"; pname = "feishu"; - packageHash = "5db94058d7ad"; # A hash value used in the download url + packageHash = "2844ab12b34f"; # A hash value used in the download url src = fetchurl { url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; - sha256 = "ffb29b5a184b025d4e4ea468a8f684a7067ab5bfd45867abc370e59be63892c7"; + sha256 = "c0ca999edc10d8ada08c46b33b15d7db0ced264248abd3ebfdb895d8457e1bec"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 2f02e28df412..d0d24b1b9173 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-395rleN2T8iUejLRjl51N+lgqtWwHXad36WpIT1BFGQ="; + sha256 = "sha256-19HDEbp+zqd1VjRoT3yaGEDAwElKlhCm31bemdK90VU="; }; extraBuildInputs = [ xorg.libxshmfence ]; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 33f3b90873d7..5dc09ae1f3ee 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl - makeWrapper ]; propagatedBuildInputs = with perlPackages; [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index d5641c24fb07..a2885d7194f4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -7,7 +7,7 @@ in symlinkJoin { paths = [ pidgin ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/pidgin \ diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index dd4e104aa66a..cebc1f9eb423 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -137,7 +137,7 @@ let hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810="; }; - buildInputs = [ xar cpio makeWrapper ]; + nativeBuildInputs = [ xar cpio makeWrapper ]; unpackPhase = '' xar -xf $src diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f85fa1e28f6c..9accc9162c23 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/Zoom.desktop \ --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - for i in zopen zoom ZoomLauncher; do + for i in aomhost zopen zoom ZoomLauncher; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i done diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index ffd30c754b47..4cd9706bdb97 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { dontStrip = true; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl - makeWrapper ] ++ (with perlPackages; [ FileRemove DigestSHA1 diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index c281756bed35..3faf7ce6a76b 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -52,6 +52,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; homepage = "https://www.slsknet.org"; + mainProgram = "SoulseekQt"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 1dab78a8fca8..e1adecd90f34 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.15"; + version = "3.23"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-07cIqGKmw2Co7GEc/APiOWTgflUwDIQPQzs73XTAPQA="; + sha256 = "sha256-Pq0t8KDrmPfkJ0sWtpw1iAwycLj+YIuYIanyqEjdf5A="; }; - vendorSha256 = "sha256-4U96s9PJLuVuzgWXCMLKfXK/XK1EaC+ep2c8TpKVRlc="; + vendorSha256 = "sha256-YbdGtB6BEo8RoEYXjj1NG8bXMDojddd1UY0IXQK1Kgo="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/office/paperwork/flaky_test.patch b/pkgs/applications/office/paperwork/flaky_test.patch new file mode 100644 index 000000000000..db805f8a0bc4 --- /dev/null +++ b/pkgs/applications/office/paperwork/flaky_test.patch @@ -0,0 +1,12 @@ +diff --git a/paperwork-backend/tests/docimport/tests_converted.py b/paperwork-backend/tests/docimport/tests_converted.py +index 1d1ae39b..bda63fce 100644 +--- a/paperwork-backend/tests/docimport/tests_converted.py ++++ b/paperwork-backend/tests/docimport/tests_converted.py +@@ -102,6 +102,7 @@ class TestConvertedImport(unittest.TestCase): + ) + ) + ++ @unittest.skip("flaky test: https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700") + def test_import_duplicated_docx(self): + with tempfile.TemporaryDirectory() as tmp_dir: + self.config.settings = { diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index ad5e5a3b6d42..b9e78246609b 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,10 +1,6 @@ { buildPythonPackage , lib , fetchFromGitLab - -, isPy3k -, isPyPy - , pyenchant , scikit-learn , pypillowfight @@ -20,8 +16,13 @@ , openpaperwork-core , openpaperwork-gtk , psutil - -, pkgs +, gtk3 +, poppler_gi +, gettext +, which +, shared-mime-info +, libreoffice +, unittestCheckHook }: buildPythonPackage rec { @@ -30,48 +31,62 @@ buildPythonPackage rec { sourceRoot = "source/paperwork-backend"; - # Python 2.x is not supported. - disabled = !isPy3k && !isPyPy; + patches = [ + # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 + ./flaky_test.patch + ]; - patchPhase = '' + patchFlags = [ "-p2" ]; + + postPatch = '' echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools ''; propagatedBuildInputs = [ - pyenchant - scikit-learn - pypillowfight - pycountry - whoosh - termcolor - python-Levenshtein + distro + gtk3 libinsane + natsort + openpaperwork-core + pyenchant + pycountry pygobject3 pyocr - natsort - pkgs.poppler_gi - pkgs.gtk3 - distro - openpaperwork-core + pypillowfight + python-Levenshtein + poppler_gi + scikit-learn + termcolor + whoosh ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; + nativeBuildInputs = [ + gettext + shared-mime-info + which + ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which pkgs.shared-mime-info ]; preBuild = '' make l10n_compile ''; - checkInputs = [ openpaperwork-gtk psutil pkgs.libreoffice ]; + checkInputs = [ + libreoffice + openpaperwork-gtk + psutil + unittestCheckHook + ]; - meta = { + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { description = "Backend part of Paperwork (Python API, no UI)"; - homepage = "https://openpaper.work/"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ aszlig symphorien ]; + homepage = "https://openpaper.work"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aszlig symphorien ]; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index ed374f7181d2..a7d68da37ea5 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -2,6 +2,7 @@ , stdenv , autoPatchelfHook , fetchurl +, glib-networking , glibc , gcc-unwrapped , gtk3 @@ -25,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.59.0"; + version = "0.59.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-dPmrj4DM3c9dLldi1ZfoLgchZellart9PfADormj2Gk="; + sha256 = "sha256-isa9hVs7bTWP0CDLLKKek7hUe4b5OuEkA5m9UARZZ30="; }; nativeBuildInputs = [ @@ -38,8 +39,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glibc gcc-unwrapped + glib-networking + glibc libsecret ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index ef8b4d54ff01..552f685ffce8 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.8.3"; + version = "22.8.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-f6/MlgAlJWf8RpKiJNP5gWjesUfkxaabWW4lXQCLtdQ="; + sha256 = "cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 409553608235..5836dba54c12 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.11.5"; + version = "7.11.6"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-+RMQd2iQmvFfgBhpa5T5SQJsn9wZ3qocDkO9b0O+CsE="; + sha256 = "sha256-BXRnc6c/PpFdF4gPemU6IzVQvr+Tl5Fbxz7mY6Z5u7o="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index d909b26526a9..d19a4a88fe7d 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,157 +1,68 @@ -{ lib, stdenv +{ lib +, stdenv , mkDerivation , fetchurl , dpkg , wrapGAppsHook , wrapQtAppsHook +, autoPatchelfHook , alsa-lib -, atk -, bzip2 -, cairo -, cups -, dbus -, expat -, ffmpeg -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gperftools -, gtk2-x11 -, libpng12 , libtool -, libuuid -, libxml2 -, xz , nspr -, nss -, openssl -, pango -, qt4 -, qtbase -, sqlite -, unixODBC +, mesa +, libtiff +, cups , xorg -, zlib -, steam +, steam-run , makeWrapper +, useChineseVersion ? false }: stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.9615"; + version = "11.1.0.11664"; - src = fetchurl { - url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb"; - sha256 = "0dpd4njpizclllps3qagipycfws935rhj9k5gmdhjfgsk0ns188w"; + src = if useChineseVersion then fetchurl { + url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; + sha256 = "sha256-D2LhxBMHmQjVExa/63DHdws0V+EmOSlJzGq91jbuJHs="; + } else fetchurl { + url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; + sha256 = "sha256-9qZGqs4nsB9mWCJTi2x+vWmMF0sEoUYgEzLI//hijfU="; }; + unpackCmd = "dpkg -x $src ."; sourceRoot = "."; - postUnpack = lib.optionalString (version == "11.1.0.9505") '' - # distribution is missing libjsapiservice.so, so we should not let + postUnpack = '' + # distribution is missing libkappessframework.so, so we should not let # autoPatchelfHook fail on the following dead libraries - rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} + rm -r opt/kingsoft/wps-office/office6/addons/pdfbatchcompression + + # Remove the following libraries because they depend on qt4 + rm -r opt/kingsoft/wps-office/office6/{librpcetapi.so,librpcwpsapi.so,librpcwppapi.so,libavdevice.so.58.10.100,libmediacoder.so} + rm -r opt/kingsoft/wps-office/office6/addons/wppcapturer/libwppcapturer.so + rm -r opt/kingsoft/wps-office/office6/addons/wppencoder/libwppencoder.so ''; - nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper ]; + nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper autoPatchelfHook ]; - meta = with lib; { - description = "Office suite, formerly Kingsoft Office"; - homepage = "https://www.wps.com/"; - platforms = [ "x86_64-linux" ]; - hydraPlatforms = []; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ mlatus th0rgal ]; - }; - - buildInputs = with xorg; [ + buildInputs = [ alsa-lib - atk - bzip2 - cairo - dbus.lib - expat - ffmpeg - fontconfig - freetype - gdk-pixbuf - glib - gperftools - gtk2-x11 - libICE - libSM - libX11 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libpng12 + xorg.libXdamage + xorg.libXtst libtool - libuuid - libxcb - libxml2 - xz nspr - nss - openssl - pango - qt4 - qtbase - sqlite - unixODBC - zlib + mesa + libtiff cups.lib ]; - dontPatchELF = true; - - # wpsoffice uses `/build` in its own build system making nix things there - # references to nix own build directory - noAuditTmpdir = true; - - unvendoredLibraries = [ - # Have to use parts of the vendored qt4 - #"Qt" - "SDL2" - "bz2" - "avcodec" - "avdevice" - "avformat" - "avutil" - "swresample" - "swscale" - "jpeg" - "png" - # File saving breaks unless we are using vendored llvmPackages_8.libcxx - #"c++" - "ssl" "crypto" - "nspr" - "nss" - "odbc" - "tcmalloc" # gperftools - ]; - - installPhase = let - steam-run = (steam.override { - extraPkgs = p: buildInputs; - }).run; - in '' + installPhase = '' + runHook preInstall prefix=$out/opt/kingsoft/wps-office mkdir -p $out cp -r opt $out cp -r usr/* $out - for lib in $unvendoredLibraries; do - rm -v "$prefix/office6/lib$lib"*.so{,.*} - done for i in wps wpp et wpspdf; do substituteInPlace $out/bin/$i \ --replace /opt/kingsoft/wps-office $prefix @@ -160,17 +71,18 @@ stdenv.mkDerivation rec { substituteInPlace $i \ --replace /usr/bin $out/bin done - for i in wps wpp et wpspdf; do mv $out/bin/$i $out/bin/.$i-orig makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \ --add-flags $out/bin/.$i-orig \ --argv0 $i done + runHook postInstall ''; dontWrapQtApps = true; dontWrapGApps = true; + postFixup = '' for f in "$out"/bin/*; do echo "Wrapping $f" @@ -179,4 +91,13 @@ stdenv.mkDerivation rec { "''${qtWrapperArgs[@]}" done ''; + + meta = with lib; { + description = "Office suite, formerly Kingsoft Office"; + homepage = "https://www.wps.com"; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = [ ]; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mlatus th0rgal rewine ]; + }; } diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index c04d6af080e3..719f45065002 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GIXMtFCobpegCqkF1zgcqeB72JZ8BXBaYdAAfS4iKW4="; + sha256 = "sha256-kL9kfJrXnhCiQ7gFjIc94Ff9cBLiUNWuZXSDl4ei7NY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 8ab389afaee5..1ebf3a1ec468 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.60"; + version = "2.61"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-38PIardlOzDrVKWvV4AiQlecTYmwYegtzRya713Au/Y="; + sha256 = "sha256-rDhYVMDTH9mSu90HZAX8ap4HF//8fYhW/ozzJdIrUgo="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 2018878773ef..1cd23d0f414d 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -32,10 +32,7 @@ let ]; } // (attrs.meta or {}); - buildInputs = [ - dpkg - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper dpkg ]; libs = attrs.libs or [ atk diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index 09d36094e7c9..da75983e40f6 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.2.5"; + version = "3.3.1"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-QwJmbABAax4yCbcRONArtj5EUKO1gh3pVoLi2hF/WJI="; + sha256 = "sha256-8QXFTQQZ5Q1SRQI4jWzRek+3BTuWfGHJIbgvwbZulg8="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index a7c49501672e..cfa8f62990c5 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { # fails to configure on darwin due to gmp not found configureFlags = [ "LIBS=-L${gmp}/lib" "CXXFLAGS=-I${gmp.dev}/include" ]; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 4cbe6ac14484..d43c70c4e820 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.46.0"; + version = "3.47.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "741670c439f1ca266bc7fe61ef7212cc9afd9dd8"; - sha256 = "sha256-/4R9i9906e5WQnaKNqUqUyDDIbSW9DNKdGg4rlrvC6c="; + rev = "4f9b974353ea684c98ec938f91f3a526218503ed"; + sha256 = "sha256-e/MnyYtkBLVU2MHGHhyAnYRFpVDhrykbKDphhGz48OE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 6e9ff90315cd..dbc5c8a0f179 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; }; - nativeBuildInputs = [ pkg-config texinfo python3 ]; + nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext - makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw + gsettings-desktop-schemas hicolor-icon-theme ssw ]; doCheck = false; diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 451edb8f085e..79d4f78082e0 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { pname = "sage-tests"; inherit src; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper sage-with-env ]; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index df3a1467d53c..23069f335b8f 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -30,7 +30,6 @@ assert (!blas.isILP64) && (!lapack.isILP64); let buildInputs = [ pythonEnv # for patchShebangs - makeWrapper pkg-config blas lapack singular @@ -73,7 +72,7 @@ let [] ); - allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs); + allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs )); # fix differences between spkg and sage names # (could patch sage instead, but this is more lightweight and also works for packages depending on sage) diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 87f3e1137b19..73776a74cdf9 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { pname = "sage"; src = sage-with-env.env.lib.src; - buildInputs = [ - makeWrapper - ] ++ lib.optionals requireSageTests [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals requireSageTests [ # This is a hack to make sure sage-tests is evaluated. It doesn't acutally # produce anything of value, it just decouples the tests from the build. sage-tests diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index 0c2220b7ea28..bc6bc9620215 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -11,7 +11,7 @@ symlinkJoin { omshell ]; - buildInputs = [ gnumake makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/OMEdit \ diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 18668b532a89..0359ed7ac609 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-SIXenrdIprAFOvz68Kn9qwmxLtDNkMUHxkXYFIyKo0Y="; + sha256 = "sha256-Ic2AsPFdRk3XdTVGbPBByxcHRAGGQfYoQm9GlgmSvA4="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 682f0d97f6b4..1ad75e75b7bf 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "git-crecord"; - version = "20201025.0"; + version = "20220324.0"; src = fetchFromGitHub { owner = "andrewshadura"; repo = "git-crecord"; rev = version; - sha256 = "1rkdmy2d2vsx22fx97nd9afh0g5lq4pns7rdxyl711apq1bhiihn"; + sha256 = "sha256-LWO9vteTIe54zTDWyRotLKIIi5SaGD0c9s7B5aBHm0s="; }; propagatedBuildInputs = with python3.pkgs; [ docutils ]; @@ -16,9 +16,10 @@ python3.pkgs.buildPythonApplication rec { # has no tests doCheck = false; - meta = { + meta = with lib; { homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f680fc6b1438..f7d7c1e342ce 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.28"; + version = "2.29.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-wuEwyhKclbfkcm8Wc5wyoLT1p/V0zAtaQB1gbuwqalM="; + sha256 = "sha256-odlvhkgIiNB8fsRfVswiqfpAKLtP9EtcoMxd5SmhX8I="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index a3d47ff6a506..aee4ee3df1b6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -129,8 +129,9 @@ stdenv.mkDerivation { inherit src; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools ]; patches = [ diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index f5cf29fc4d0e..4912dae3233a 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: +{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Setup.pm \ --replace hostname "${nettools}/bin/hostname" + substituteInPlace src/commands/sskm \ + --replace /bin/rm "${coreutils}/bin/rm" ''; postFixup = '' diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 35c628f8a59d..e29b0a488060 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - [ yasm cmake pkg-config ] + [ yasm cmake pkg-config makeWrapper ] ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig - freetype alsa-lib libXext libGLU makeWrapper + freetype alsa-lib libXext libGLU ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix new file mode 100644 index 000000000000..49c542b459fb --- /dev/null +++ b/pkgs/applications/video/dmlive/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, makeWrapper +, openssl +, Security +, mpv +, ffmpeg +, nodejs +}: + +rustPlatform.buildRustPackage rec { + pname = "dmlive"; + version = "unstable-2022-08-22"; + + src = fetchFromGitHub { + owner = "THMonster"; + repo = pname; + rev = "fd4fa1859f05350658db598a50d29f59d22b55a1"; + hash = "sha256-NVabHLxPHi7hWoztthPmVC5VRKQKglpytuUQOY1Hzrw="; + }; + + cargoHash = "sha256-TziP7n9Xgi/wHaiF/NI6noMp1iR6vRuAXxvKJwQHbTw="; + + OPENSSL_NO_VENDOR = true; + + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + postInstall = '' + wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" + ''; + + meta = with lib; { + description = "A tool to play and record videos or live streams with danmaku"; + homepage = "https://github.com/THMonster/dmlive"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 8b81110b8485..179db58572d0 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-SAq6sXhYySqebXbWHJ9X6q1wWnNJjgwKf8YLTXZpKuA="; + sha256 = "sha256-CxwNnSwF3QD86lzDgSlGZiEv2tMOfDTUGHOZVtsmY94="; }; vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo="; diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix index 39c0918be0d0..6c44b019a1c9 100644 --- a/pkgs/applications/virtualization/flintlock/default.nix +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -10,16 +10,16 @@ buildGoModule rec{ pname = "flintlock"; - version = "0.1.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flintlock"; rev = "v${version}"; - sha256 = "sha256-uzsLvmp30pxDu0VtzRD1H4onL4sT/RC3CBnzfahm0Fw="; + sha256 = "sha256-zVsI8443/4joOhhuqhrUGsIW6iFvetW9BhHqASL+XUk="; }; - vendorSha256 = "sha256-vkSO+mIEPO8urEYqMjQLoHB4mtSxfJC74zHWpQbQL9g="; + vendorSha256 = "sha256-PPda8/9WSiWQYyJJQhWo94g8LqGEEwx2u2j2wfqpOv0="; subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index f2481e25a8fd..3bb12836a032 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -4,25 +4,27 @@ stdenv.mkDerivation rec { pname = "lkl"; version = "2019-10-04"; - rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047"; outputs = [ "dev" "lib" "out" ]; + src = fetchFromGitHub { + owner = "lkl"; + repo = "linux"; + rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047"; + sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62"; + }; + nativeBuildInputs = [ bc bison flex python3 ]; buildInputs = [ fuse libarchive ]; - src = fetchFromGitHub { - inherit rev; - owner = "lkl"; - repo = "linux"; - sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62"; - }; + postPatch = '' + # Fix a /usr/bin/env reference in here that breaks sandboxed builds + patchShebangs arch/lkl/scripts - # Fix a /usr/bin/env reference in here that breaks sandboxed builds - prePatch = "patchShebangs arch/lkl/scripts"; - # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 - postPatch = "sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c"; + # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 + sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c + ''; installPhase = '' mkdir -p $out/bin $lib/lib $dev @@ -61,7 +63,7 @@ stdenv.mkDerivation rec { overhead ''; homepage = "https://github.com/lkl/linux/"; - platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it + platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bb20f2a73840..32dc872a5c4b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -126,6 +126,27 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/418ade7849ce7641c0f7333718caf5091a02fd4c.patch"; sha256 = "sha256-zQHDXedIXZBnabv4+3TA4z5mY1+KZiPmqUbhaSkGLgA="; }) + # needed for CVE-2022-0216's test to pass + (fetchpatch { + name = "fuzz-tests-x86-only.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/b911c30c566dee48a27bc1bfa1ee6df3a729cbbb.patch"; + sha256 = "sha256-RXKRmZo25yZ1VuBtBA+BsY8as9kIcACqE6aEYmIm9KQ="; + }) + (fetchpatch { + name = "CVE-2022-0216.part-1.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8.patch"; + sha256 = "sha256-0z0zVPBVXFSU8qEV0Ea2+rDxyikMyitlDM0jZOLLC6s="; + }) + (fetchpatch { + name = "CVE-2022-0216.part-2.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/4367a20cc442c56b05611b4224de9a61908f9eac.patch"; + sha256 = "sha256-hpNu4Zjw1dIbT6Vt57cayHE1Elaltp0a/bsKlDY0Qr8="; + }) + (fetchpatch { + name = "CVE-2020-14394.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/effaf5a240e03020f4ae953e10b764622c3e87cc.patch"; + sha256 = "sha256-NobsIxRC+xlyj8d/oD4mqgXAGX37pfww/PQQuKhrTzc="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 621514ad4c82..7837bd3751a4 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.1.4"; + version = "7.4.2"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-geYn1ir8h1EAUpTWsTS7giQt5eQwIBFeemS+a940ORg="; + sha256 = "sha256-oyxD6VCut7OfFYozdP0D2+ocOvidTrtaYrh0oCfZzBY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index f7d2f4cf2084..3b7e4c4a4b04 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.39"; + version = "3.11.43"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-MpJczFZk0syt/CMwAhA7H+01G8E4syFsJGnzD/RneQQ="; + hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index ceb0cb8b03af..7c4db29467fb 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { unzip ]; sourceRoot = "."; + unpackCmd = "unzip -o $curSrc"; buildPhase = '' echo "selected fonts are ${toString selectedFonts}" ls *.otf *.ttf diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index 4194e57532dc..6fa8a86e3667 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,52 +1,55 @@ { - "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; - "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; - "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; - "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; - "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; - "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; - "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; - "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; - "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; - "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; - "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; - "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; - "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; - "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; - "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; - "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; - "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; - "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; - "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; - "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; - "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; - "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; - "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; - "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; - "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; - "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; - "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; - "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; - "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; - "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; - "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; - "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; - "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; - "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; - "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; - "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; - "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; - "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; - "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; - "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; - "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; - "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; - "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; - "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; - "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; - "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; - "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; - "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; - "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; - "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; + "3270" = "1bzrgc3iksm9n8gxljwbgzm0ch115vvafiwrih2n5caz8wvs86qn"; + "Agave" = "1xkl9xjqlm1g2864sf4z5bcxhfaxmszvhm4lbp6cnkzg0m1chypj"; + "AnonymousPro" = "1g8p6g9rfm7adazii5swrn1m0w733wlbclqq4r0xbykn1gdghbmz"; + "Arimo" = "01gijkyfs97ij7iraajgbkvhnj1cxjyppw9q5y67fwgz8wa22q2j"; + "AurulentSansMono" = "1hy8gf2h552vr4fnr53pn5biqnwakw15yqwlswi8g4l3jxp0f1xi"; + "BigBlueTerminal" = "0avczgq4dl1kgyp0c7j53asmqmggjd9cmcq190fc4n10d7g6n98w"; + "BitstreamVeraSansMono" = "1k01qsgsyqazlyl4z3qswq4rd8nh8ksarhrrjn1z88h150ynd3lh"; + "CascadiaCode" = "0r8c93f6ysqwl6bsb3avjnhx20fcxz6ng0mwddhcaz14dhl9y0q6"; + "CodeNewRoman" = "1b1lb66pxalhmr64y0vc75n1ngwkllsam771qwsjycr6crraqzjm"; + "Cousine" = "172aagpkfzdnja7dpvlampjzgw9w3r0pd8z0ppnkhj98xcpk680d"; + "DaddyTimeMono" = "1khfqbicxl19dh1hky541vk1n0j41w2qaxw4ih8z8hdzdwz8frz0"; + "DejaVuSansMono" = "1s40g91frl0ngak0q0qp0vh9nbkh22mlf25ly248aq46k3kqswv6"; + "DroidSansMono" = "1m2pnhs9rlf4kspxk0x3c22v0c1byidblmhm2b0kg284jjml9rql"; + "FantasqueSansMono" = "0yslgnr1gjqx4bm9ld7z9lmqqvivswqx5byilggr42v1m7dnayc1"; + "FiraCode" = "0bwfxrkpjpgh832bprch4kzrr03d0raf3cgl7n3w3n8a4d806hb3"; + "FiraMono" = "08swhnqyz334202dcd8dzjf800kd3n3dq26wajmcphlps269y2p6"; + "FontPatcher" = "1icakcp6p805d2afa5vaynrhyxsvl7p1j2dyfgxplqgsfclj2cs1"; + "Go-Mono" = "01yy8mcffa6pz6hj6cwrdlsqhc6fbsnd2npqzi8zlx32qdzsrkj3"; + "Gohu" = "0dyxam4rmpfjw59x5b2c1mdg3jcvjsgjcdpw83gih261d05kmx13"; + "Hack" = "0rjxy98b16qxam8nr00cj4cd82jq0r23p2wymn9g3vy6bl836bvl"; + "Hasklig" = "0qpq14allkr3x5i1sfbpaa9n6ilb6f9hy4z5r0i2vj1qbksbdffb"; + "HeavyData" = "1zk4vilqq1v5hw687an57mf1msrj6iyin1kbm4b38jcq1d7wc5sp"; + "Hermit" = "043hqz5mxjghpfg5kninavy6p24r4i4ryhj89bhpwrgq6vbpbk7l"; + "iA-Writer" = "0l3bbpdiw20vxqmpaf42zvcsj08hjl644qjkpp9z53a184jxsad5"; + "IBMPlexMono" = "00cib33fxwdq48b26hm3vg6svwmmpr7rb537002h21ykvyw7my2n"; + "Inconsolata" = "00y47m077pwhx4165ifgdqxbdsigy0y6f9p6y4py8qz8jnfimc9i"; + "InconsolataGo" = "103lf5dy65k6ik87sr91iji44ali81mf18af7vw8qr5w9j3v88m1"; + "InconsolataLGC" = "0f598lnywpv8s6m9dzhklk490f5lq5ykfxaql9q6yp5fg7d9pc6z"; + "Iosevka" = "14mk8n7w2mjdrwzz4hf3zdkqvkm2zkk3l91kx0lldyfyapdz0z1i"; + "JetBrainsMono" = "1f0x9zpmvsr4hmxchxpyy470qrcl232ljd13dhf6skm50702vpar"; + "Lekton" = "0zj7rvz9bi9apsb068vf04lhggif78s4mwvgi85vpi8wsncj2df5"; + "LiberationMono" = "0syx7jgglxvaif7rp0kh1ywyyza5frssd20zphj42bdf6pcladgm"; + "Lilex" = "0gxlmylri3251zd76hkql6ck7x07x5yn3jcbg8ccq1vnw402v1vl"; + "Meslo" = "160z4v8pvpqk1zw1flanspcdmjb5bdpfmhkz8gv6ywflmlhnf87s"; + "Monofur" = "125bnmz2a0xm1qcyqpf72cm44bw5rqf06mcp8n982md27lckypcn"; + "Monoid" = "1zr6wh3zkgm5azys75szbzagnkj840czzz50fs8j5vi2j5x1gqzx"; + "Mononoki" = "15g910k4w5gdd6c4hrnxapb2irbpnlx2yvhmifnmmisyrvzpqdg1"; + "MPlus" = "0f5s9jxk7c9g9h5vrfh4b14w5pfzpidna8k5zpaqj1xz8m80ry98"; + "NerdFontsSymbolsOnly" = "0qxx0p4fija26aqya8az9vjwprbncjdpl9cnl756ap8db8ymrf4q"; + "Noto" = "03q8sar4vw0fscrvmnphr82mgh6ijgmsmw04ci4x4kz0371zbvbs"; + "OpenDyslexic" = "13yg3skw55vi721mbymcnyxwmlf92jzwankj7ggf6fzmmw9r72j8"; + "Overpass" = "0rnwzvd1zfwybf1gvxbqac4nl2rb2fpdpjj86qrydrjnszd5r1rf"; + "ProFont" = "0fkhzkqs3srsdhi3rgpvsqdifhsbfydw8q5h2s40v6jqaq6i7pv0"; + "ProggyClean" = "0smdg5sawy5ykph0whj2q4s89c08czfdfp7w5ipc3pzq598d0ahz"; + "RobotoMono" = "0wy99prkr1anhc5d1gd4dbvvi2krhcjh4nx9ib2fvw374fmys4mx"; + "ShareTechMono" = "09xg72wgkgl68hygbzndvizjshnir661jwz0iyx0nhsqsmfpg8gh"; + "SourceCodePro" = "1g9kj8gpsc3lqj8cik7zisfsm28jvmh29r399wc4aaaz41hcpigr"; + "SpaceMono" = "128pg00ay5n2havfjk116a0gfqqdlm5xy30akgjszhgsnpfg214x"; + "Terminus" = "02yf6id9nnxm2li1s9izvcbqzrhznh1041lh604dvkxqnnriq6n4"; + "Tinos" = "0ksx8x4917kl7h6y4lk7mwq1s2ag5zjjyz9amc2w80qxfdqwgc1m"; + "Ubuntu" = "1mlkpsnwj5bgkw1671v939pnb1shk31nj6pm7p73bjrvihwgdbwz"; + "UbuntuMono" = "1g51a9giv096hnd7jr3xgbnhx7m4andfd0jm892f99n65fqy2x6y"; + "VictorMono" = "1gaf7ysd9gqhksbvb877n3qiki3iny2dgkfpgfwl4p8nzrxcn8jm"; } diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix index 8320adbf0258..e7805653ae21 100644 --- a/pkgs/data/fonts/nerdfonts/version.nix +++ b/pkgs/data/fonts/nerdfonts/version.nix @@ -1 +1 @@ -"2.1.0" +"2.2.1" diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 56491fe4443b..da37b5887e02 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2022-02-21"; + version = "2022-08-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-tnhu//q0Vl7MiMeHopB1Gwokkw/P+nDOo4HKizjxC0Y="; + sha256 = "sha256-SW4MNvtrHpJm6yiS9k11XzzzGSMXdZ71cnvASK1dzno="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 2edec2704601..6180f9185e77 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz", - "sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8", - "msg": "Update from Hackage at 2022-08-09T06:14:32Z" + "commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz", + "sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4", + "msg": "Update from Hackage at 2022-08-20T06:29:36Z" } diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index 9b24c1241e13..bb8931510876 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-emoji-selector"; - version = "20"; + version = "22"; src = fetchFromGitHub { owner = "maoschanz"; repo = "emoji-selector-for-gnome"; rev = version; - sha256 = "sha256-I5aEHDC5GaGkAoH+1l4eyhBmJ+lmyZZoDw2Fq2SSlmo="; + sha256 = "sha256-sD/xlNrs2ntI7KaPMopT5CnFyuXd9ZKuKPNQYgiho0U="; }; passthru = { diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 513e4ec3eec6..f2d50fa6f921 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -25,11 +25,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k="; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ - libtool - makeWrapper - ]; + nativeBuildInputs = [ autoconf automake makeWrapper libtool ]; propagatedBuildInputs = [ libffi gmp diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index b5e17efd3633..376e956d7ca1 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs, lib, makeWrapper }: let @@ -18,7 +18,7 @@ let elmVersion = drv.version; registryDat = ./registry.dat; }; - buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; + buildTools = drv.buildTools or [] ++ [ makeWrapper ]; jailbreak = true; postInstall = '' wrapProgram $out/bin/elm \ @@ -214,7 +214,7 @@ in lib.makeScope pkgs.newScope (self: with self; { elm-pages = nodePkgs."elm-pages".overrideAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # can't use `patches = [ ]` with a nodePkgs derivation; # need to patch in one of the build phases instead. diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.2.nix similarity index 96% rename from pkgs/development/compilers/ghc/9.4.1.nix rename to pkgs/development/compilers/ghc/9.4.2.nix index 71921f5e7639..cd353541da90 100644 --- a/pkgs/development/compilers/ghc/9.4.1.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -1,4 +1,4 @@ -# Preliminary GHC 9.4.1 expression using the make build system. +# Preliminary GHC 9.4.2 expression using the make build system. # TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6 # where make support will be dropped. { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages @@ -177,12 +177,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.4.1"; + version = "9.4.2"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM="; + sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5"; }; enableParallelBuilding = true; @@ -190,16 +190,6 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = [ - # add missing profiling targets in make build system - (fetchpatch { - name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff"; - sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU="; - }) - ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch - ]; - postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. diff --git a/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch b/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch deleted file mode 100644 index d0d94717d9c4..000000000000 --- a/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs -index acd0d61..3e83c15 100644 ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -1916,6 +1916,7 @@ linkBinary' staticLink dflags o_files dep_packages = do - ++ pkg_framework_opts - ++ debug_opts - ++ thread_opts -+ ++ (if (platformOS platform `elem` [OSDarwin]) then [ "-Wl,-dead_strip_dylibs" ] else []) - )) - - exeFileName :: Bool -> DynFlags -> FilePath -diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs -index 1ab5b13..2ebbf51 100644 ---- a/compiler/main/SysTools.hs -+++ b/compiler/main/SysTools.hs -@@ -1737,6 +1737,7 @@ linkDynLib dflags0 o_files dep_packages - ++ map Option pkg_lib_path_opts - ++ map Option pkg_link_opts - ++ map Option pkg_framework_opts -+ ++ [ Option "-Wl,-dead_strip_dylibs" ] - ) - OSiOS -> throwGhcExceptionIO (ProgramError "dynamic libraries are not supported on iOS target") - _ -> do diff --git a/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch b/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch deleted file mode 100644 index e10fb5cb280d..000000000000 --- a/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/ghc.mk b/ghc.mk -index dd65e7adfe..b91af56078 100644 ---- a/ghc.mk -+++ b/ghc.mk -@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra - libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi - libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi - libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi -+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi - - libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi - libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi - libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi - libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi -+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi - - ifeq "$(BIGNUM_BACKEND)" "gmp" - GMP_ENABLED = YES diff --git a/pkgs/development/compilers/ghc/issue-18549.patch b/pkgs/development/compilers/ghc/issue-18549.patch deleted file mode 100644 index eb30d9d9dd4c..000000000000 --- a/pkgs/development/compilers/ghc/issue-18549.patch +++ /dev/null @@ -1,296 +0,0 @@ -From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001 -From: Ben Gamari -Date: Sun, 9 Aug 2020 09:15:16 -0400 -Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols" - -This reverts commit aa2e5863699306920513b216f337de09e29b5bb8. ---- - rts/RtsSymbols.c | 224 ++++------------------------------------------- - 1 file changed, 17 insertions(+), 207 deletions(-) - -diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c -index d10a6900db..b2f90a892d 100644 ---- a/rts/RtsSymbols.c -+++ b/rts/RtsSymbols.c -@@ -58,6 +58,7 @@ - SymI_HasProto(signal_handlers) \ - SymI_HasProto(stg_sig_install) \ - SymI_HasProto(rtsTimerSignal) \ -+ SymI_HasProto(atexit) \ - SymI_NeedsDataProto(nocldstop) - #endif - -@@ -976,213 +977,29 @@ - RTS_USER_SIGNALS_SYMBOLS \ - RTS_INTCHAR_SYMBOLS - -+ - // 64-bit support functions in libgcc.a --// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc --#define RTS_LIBGCC_SYMBOLS_32 \ -- SymI_NeedsProto(__fixunsdfdi) \ -- /* 4 The GCC low-level runtime library */\ -- /* 4.1.1 Arithmetic functions */\ -- /* SymI_NeedsProto(__ashlsi3) */\ -- SymI_NeedsProto(__ashldi3) \ -- /* SymI_NeedsProto(__ashlti3) */\ -- /* These functions return the result of shifting a left by b bits. */\ -- /* SymI_NeedsProto(__ashrsi3) */\ -- SymI_NeedsProto(__ashrdi3) \ -- /* SymI_NeedsProto(__ashrti3) */\ -- /* These functions return the result of arithmetically shifting a right by b bits. */\ -- /* SymI_NeedsProto(__divsi3) */\ -- SymI_NeedsProto(__divdi3) \ -- /* SymI_NeedsProto(__divti3) */\ -- /* These functions return the quotient of the signed division of a and b. */\ -- /* SymI_NeedsProto(__lshrsi3) */ \ -- SymI_NeedsProto(__lshrdi3) \ -- /* SymI_NeedsProto(__lshrti3) */ \ -- /* These functions return the result of logically shifting a right by b bits. */\ -- /* SymI_NeedsProto(__modsi3) */ \ -- SymI_NeedsProto(__moddi3) \ -- /* SymI_NeedsProto(__modti3) */ \ -- /* These functions return the remainder of the signed division of a and b. */\ -- /* SymI_NeedsProto(__mulsi3) */ \ -- SymI_NeedsProto(__muldi3) \ -- /* SymI_NeedsProto(__multi3) */ \ -- /* These functions return the product of a and b. */\ -- SymI_NeedsProto(__negdi2) \ -- /* SymI_NeedsProto(__negti2) */ \ -- /* These functions return the negation of a. */\ -- /* SymI_NeedsProto(__udivsi3) */ \ -- SymI_NeedsProto(__udivdi3) \ -- /* SymI_NeedsProto(__udivti3) */ \ -- /* These functions return the quotient of the unsigned division of a and b. */\ -- SymI_NeedsProto(__udivmoddi4) \ -- /* SymI_NeedsProto(__udivmodti4) */ \ -- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\ -- /* SymI_NeedsProto(__umodsi3) */ \ -- SymI_NeedsProto(__umoddi3) \ -- /* SymI_NeedsProto(__umodti3) */ \ -- /* These functions return the remainder of the unsigned division of a and b. */\ -- /* 4.1.2 Comparison functions */\ -- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\ -- SymI_NeedsProto(__cmpdi2) \ -- /* SymI_NeedsProto(__cmpti2) */ \ -- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ -- SymI_NeedsProto(__ucmpdi2) \ -- /* SymI_NeedsProto(__ucmpti2) */ \ -- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ -- /* 4.1.3 Trapping arithmetic functions */\ -- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\ -- SymI_NeedsProto(__absvsi2) \ -- SymI_NeedsProto(__absvdi2) \ -- /* These functions return the absolute value of a. */\ -- /* SymI_NeedsProto(__addvsi3) */ \ -- SymI_NeedsProto(__addvdi3) \ -- /* These functions return the sum of a and b; that is a + b. */\ -- /* SymI_NeedsProto(__mulvsi3) */ \ -- SymI_NeedsProto(__mulvdi3) \ -- /* The functions return the product of a and b; that is a * b. */\ -- SymI_NeedsProto(__negvsi2) \ -- SymI_NeedsProto(__negvdi2) \ -- /* These functions return the negation of a; that is -a. */\ -- /* SymI_NeedsProto(__subvsi3) */ \ -- SymI_NeedsProto(__subvdi3) \ -- /* These functions return the difference between b and a; that is a - b. */\ -- /* 4.1.4 Bit operations */\ -- SymI_NeedsProto(__clzsi2) \ -- SymI_NeedsProto(__clzdi2) \ -- /* SymI_NeedsProto(__clzti2) */ \ -- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\ -- SymI_NeedsProto(__ctzsi2) \ -- SymI_NeedsProto(__ctzdi2) \ -- /* SymI_NeedsProto(__ctzti2) */ \ -- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\ -- SymI_NeedsProto(__ffsdi2) \ -- /* SymI_NeedsProto(__ffsti2) */ \ -- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\ -- SymI_NeedsProto(__paritysi2) \ -- SymI_NeedsProto(__paritydi2) \ -- /* SymI_NeedsProto(__parityti2) */\ -- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\ -- SymI_NeedsProto(__popcountsi2) \ -- SymI_NeedsProto(__popcountdi2) \ -- /* SymI_NeedsProto(__popcountti2) */ \ -- /* These functions return the number of bits set in a. */\ -- SymI_NeedsProto(__bswapsi2) \ -- SymI_NeedsProto(__bswapdi2) --#define RTS_LIBGCC_SYMBOLS_aarch32 \ -- /* armv6l */\ -- /* TODO: should check for __ARM_EABI__ */\ -- SymI_NeedsProto(__aeabi_d2f) \ -- SymI_NeedsProto(__aeabi_d2iz) \ -- SymI_NeedsProto(__aeabi_d2lz) \ -- SymI_NeedsProto(__aeabi_d2uiz) \ -- SymI_NeedsProto(__aeabi_d2ulz) \ -- SymI_NeedsProto(__aeabi_dadd) \ -- SymI_NeedsProto(__aeabi_dcmpeq) \ -- SymI_NeedsProto(__aeabi_dcmpge) \ -- SymI_NeedsProto(__aeabi_dcmpgt) \ -- SymI_NeedsProto(__aeabi_dcmple) \ -- SymI_NeedsProto(__aeabi_dcmplt) \ -- SymI_NeedsProto(__aeabi_dcmpun) \ -- SymI_NeedsProto(__aeabi_ddiv) \ -- SymI_NeedsProto(__aeabi_dmul) \ -- SymI_NeedsProto(__aeabi_dneg) \ -- SymI_NeedsProto(__aeabi_dsub) \ -- SymI_NeedsProto(__aeabi_f2d) \ -- SymI_NeedsProto(__aeabi_f2iz) \ -- SymI_NeedsProto(__aeabi_f2lz) \ -- SymI_NeedsProto(__aeabi_f2uiz) \ -- SymI_NeedsProto(__aeabi_f2ulz) \ -- SymI_NeedsProto(__aeabi_fadd) \ -- SymI_NeedsProto(__aeabi_fcmpeq) \ -- SymI_NeedsProto(__aeabi_fcmpge) \ -- SymI_NeedsProto(__aeabi_fcmpgt) \ -- SymI_NeedsProto(__aeabi_fcmple) \ -- SymI_NeedsProto(__aeabi_fcmplt) \ -- SymI_NeedsProto(__aeabi_fcmpun) \ -- SymI_NeedsProto(__aeabi_fdiv) \ -- SymI_NeedsProto(__aeabi_fmul) \ -- SymI_NeedsProto(__aeabi_fneg) \ -- SymI_NeedsProto(__aeabi_fsub) \ -- SymI_NeedsProto(__aeabi_i2d) \ -- SymI_NeedsProto(__aeabi_i2f) \ -- SymI_NeedsProto(__aeabi_idiv) \ -- SymI_NeedsProto(__aeabi_idivmod) \ -- SymI_NeedsProto(__aeabi_l2d) \ -- SymI_NeedsProto(__aeabi_l2f) \ -- SymI_NeedsProto(__aeabi_lasr) \ -- SymI_NeedsProto(__aeabi_lcmp) \ -- SymI_NeedsProto(__aeabi_ldivmod) \ -- SymI_NeedsProto(__aeabi_llsl) \ -- SymI_NeedsProto(__aeabi_llsr) \ -- SymI_NeedsProto(__aeabi_lmul) \ -- SymI_NeedsProto(__aeabi_ui2d) \ -- SymI_NeedsProto(__aeabi_ui2f) \ -- SymI_NeedsProto(__aeabi_uidiv) \ -- SymI_NeedsProto(__aeabi_uidivmod) \ -- SymI_NeedsProto(__aeabi_ul2d) \ -- SymI_NeedsProto(__aeabi_ul2f) \ -- SymI_NeedsProto(__aeabi_ulcmp) \ -- SymI_NeedsProto(__aeabi_uldivmod) --#define RTS_LIBGCC_SYMBOLS_64 \ -+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) -+#define RTS_LIBGCC_SYMBOLS \ -+ SymI_NeedsProto(__divdi3) \ -+ SymI_NeedsProto(__udivdi3) \ -+ SymI_NeedsProto(__moddi3) \ -+ SymI_NeedsProto(__umoddi3) \ -+ SymI_NeedsProto(__muldi3) \ -+ SymI_NeedsProto(__ashldi3) \ -+ SymI_NeedsProto(__ashrdi3) \ -+ SymI_NeedsProto(__lshrdi3) \ -+ SymI_NeedsProto(__fixunsdfdi) -+#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 -+#define RTS_LIBGCC_SYMBOLS \ - SymI_NeedsProto(__udivti3) \ - SymI_NeedsProto(__umodti3) -- --/* for aarch64 */ --#define RTS_LIBGCC_SYMBOLS_aarch64 \ -- SymI_NeedsProto(__netf2) \ -- SymI_NeedsProto(__addtf3) \ -- SymI_NeedsProto(__subtf3) \ -- SymI_NeedsProto(__multf3) \ -- SymI_NeedsProto(__extenddftf2) \ -- SymI_NeedsProto(__fixtfsi) \ -- SymI_NeedsProto(__fixunstfsi) \ -- SymI_NeedsProto(__floatsitf) \ -- SymI_NeedsProto(__floatunsitf) -- --#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32 --#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 --#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64 --#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 - #else - #define RTS_LIBGCC_SYMBOLS - #endif - --#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__)) --#define RTS_SSP_SYMBOLS \ -- SymI_NeedsProto(__stack_chk_guard) \ -- SymI_NeedsProto(__stack_chk_fail) --#else --#define RTS_SSP_SYMBOLS --#endif --#if !defined(DYNAMIC) && defined(linux_HOST_OS) --// we need these for static musl builds. However when --// linking shared objects (DLLs) this will fail, hence --// we do not include them when building with -DDYNAMIC --#define RTS_LINKER_SYMBOLS \ -- SymI_NeedsProto(__fini_array_start) \ -- SymI_NeedsProto(__fini_array_end) --#else --#define RTS_LINKER_SYMBOLS --#endif -- --#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH) -- // Symbols that don't have a leading underscore -- // on Mac OS X. They have to receive special treatment, -- // see machoInitSymbolsWithoutUnderscore() --#define RTS_MACHO_NOUNDERLINE_SYMBOLS \ -- SymI_NeedsProto(saveFP) \ -- SymI_NeedsProto(restFP) --#endif -- - /* entirely bogus claims about types of these symbols */ --/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic -- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents -- * vvv from getting macro expanded. -- */ --#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void); -+#define SymI_NeedsProto(vvv) extern void vvv(void); - #define SymI_NeedsDataProto(vvv) extern StgWord vvv[]; - #if defined(COMPILING_WINDOWS_DLL) - #define SymE_HasProto(vvv) SymE_HasProto(vvv); -@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS - RTS_OPENBSD_ONLY_SYMBOLS - RTS_LIBGCC_SYMBOLS - RTS_LIBFFI_SYMBOLS --RTS_SSP_SYMBOLS --RTS_LINKER_SYMBOLS - #undef SymI_NeedsProto - #undef SymI_NeedsDataProto - #undef SymI_HasProto -@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS - #define SymE_HasDataProto(vvv) \ - SymE_HasProto(vvv) - --#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__) -+#define SymI_NeedsProto(vvv) SymI_HasProto(vvv) - #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv) - #define SymE_NeedsProto(vvv) SymE_HasProto(vvv) - #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv) -@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS - #define SymI_HasProto_deprecated(vvv) \ - { #vvv, (void*)0xBAADF00D, true }, - --void *RTS_DYNAMIC = NULL; -- - RtsSymbolVal rtsSyms[] = { - RTS_SYMBOLS - RTS_RET_SYMBOLS -@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = { - RTS_LIBGCC_SYMBOLS - RTS_LIBFFI_SYMBOLS - SymI_HasDataProto(nonmoving_write_barrier_enabled) -- RTS_SSP_SYMBOLS -- RTS_LINKER_SYMBOLS - #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH) - // dyld stub code contains references to this, - // but it should never be called because we treat - // lazy pointers as nonlazy. - { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false }, - #endif -- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false }, - { 0, 0, false } /* sentinel */ - }; --- -2.25.4 - diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index f3383bdcb5ff..54641d45bce5 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = - [ pkg-config bison flex makeWrapper ]; + nativeBuildInputs = [ pkg-config bison flex makeWrapper ]; # Intercal invokes gcc, so we need an explicit PATH postInstall = '' diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 1ee284e9f923..e4cd191683c9 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ]; - buildInputs = [ which perl jdk openssl coreutils zlib ncurses - makeWrapper gcc binutils gnumake nodejs + nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ]; + buildInputs = [ perl jdk openssl coreutils zlib ncurses ] ++ (with ocamlPackages; [ ocaml findlib ssl camlzip ulex ocamlgraph camlp4 ]); diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index 113df520b4fc..fe787cbedbf4 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -36,7 +36,7 @@ let paths = [ open-watcom ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' mkdir $out/bin diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index f9ab0714b470..283ee2dffe47 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + nativeBuildInputs = [ makeWrapper autoconf automake ]; buildInputs = (if stdenv.hostPlatform.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ - opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper + opendylan-bootstrap boehmgc perl ]; preConfigure = if stdenv.hostPlatform.system == "i686-linux" then '' diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2d8361eb2a4e..01b219714382 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -12,7 +12,10 @@ rustPlatform.buildRustPackage { cargoVendorDir = "vendor"; buildAndTestSubdir = "src/tools/cargo"; - passthru.rustc = rustc; + passthru = { + rustc = rustc; + inherit (rustc) tests; + }; # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index cfed71f0e80b..5fd374160746 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -10,6 +10,9 @@ , version , sha256 , patches ? [] +, fd +, firefox +, thunderbird }: let @@ -184,6 +187,7 @@ in stdenv.mkDerivation rec { passthru = { llvm = llvmShared; inherit llvmPackages; + tests = { inherit fd; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; }; meta = with lib; { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 984678f689c5..44f56d366022 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -56,7 +56,7 @@ let in lib.appendToName "with-plugins" ( symlinkJoin { inherit (yosys) name; paths = paths ++ [ yosys ] ; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/yosys \ --set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \ diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 1d5fe0d8f6ad..a2a59e1ab22c 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,11 +6,12 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "3.6.0"; } + { case = range "8.13" "8.16"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 3983d80a094e..19b72c4e948c 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,11 +6,12 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "1.7.0"; } + { case = range "8.13" "8.16"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index ccc51a5a7691..606162ab94c0 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "guile-fibers"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "wingo"; repo = "fibers"; rev = "v${version}"; - hash = "sha256-kU/ty/XRNfv3ubIwH40wZmo8MXApeduHcH2KEGqoh+Q="; + hash = "sha256-jEY6i+uTqDkXZKdpK+/GRLlK7aJxkRneVZQJIE4bhlI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 8dc5c434672d..752f1ba4943c 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -249,6 +249,8 @@ opening the next one. When you want to merge the currently open $ ./maintainers/scripts/haskell/merge-and-open-pr.sh PR_NUM_OF_CURRENT_HASKELL_UPDATES_PR ``` + Find the PR number easily [here](https://github.com/nixos/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Ahaskell-updates) + This does the following things: 1. Fetches `origin`, makes sure you currently have the `haskell-updates` diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ea32f88dff49..76681bebcf3e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1773,21 +1773,6 @@ self: super: { vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - # cabal-install switched to build type simple in 3.2.0.0 - # as a result, the cabal(1) man page is no longer installed - # automatically. Instead we need to use the `cabal man` - # command which generates the man page on the fly and - # install it to $out/share/man/man1 ourselves in this - # override. - # The commit that introduced this change: - # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7 - cabal-install = overrideCabal (old: { - postInstall = old.postInstall + '' - mkdir -p "$out/share/man/man1" - "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1" - ''; - }) super.cabal-install; - # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572 amazonka = appendPatches [ (fetchpatch { @@ -2420,13 +2405,12 @@ self: super: { })) ]; - # 2022-02-25: Not compatible with relude 1.0 - ema = assert super.ema.version == "0.6.0.0"; - super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; }); + # Tests require ghc-9.2. + ema = dontCheck super.ema; - glirc = super.glirc.override { + glirc = doJailbreak (super.glirc.override { vty = self.vty_5_35_1; - }; + }); # 2022-02-25: Unmaintained and to strict upper bounds paths = doJailbreak super.paths; @@ -2495,11 +2479,6 @@ self: super: { sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; }) super.wstunnel; - # Adjustment of bounds on servant is unreleased - # https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d - servant-cassava = assert super.servant-cassava.version == "0.10.1"; - doJailbreak super.servant-cassava; - # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index fd632ee81f82..2ebfdb4a8841 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -18,6 +18,10 @@ self: super: ({ __darwinAllowLocalNetworking = true; }); + streaming-commons = super.streaming-commons.overrideAttrs (_: { + __darwinAllowLocalNetworking = true; + }); + halive = addBuildDepend darwin.apple_sdk.frameworks.AppKit super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index b9dfb671ef87..74889c4c0877 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,9 +48,16 @@ self: super: { # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; - # cabal-install needs more recent versions of Cabal and base16-bytestring. + # cabal-install needs most recent versions of Cabal and Cabal-syntax cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; + }); + cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; }); # Pick right versions for GHC-specific packages diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 48c63f8b723f..ddd41bc57e72 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -48,7 +48,6 @@ self: super: { xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; }; # https://github.com/tibbe/unordered-containers/issues/214 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 7f3354a62739..1f82ecebd647 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,10 +54,16 @@ self: super: { # This build needs a newer version of Cabal. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - # cabal-install needs more recent versions of Cabal and random, but an older - # version of base16-bytestring. + # cabal-install needs most recent versions of Cabal and Cabal-syntax cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; + }); + cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; }); # Ignore overly restrictive upper version bounds. diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index a5914433a448..c5585825c382 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -49,9 +49,16 @@ self: super: { # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; - # cabal-install needs more recent versions of Cabal and base16-bytestring. - cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; + # cabal-install needs the latest/matching versions of Cabal-syntax and Cabal + cabal-install = super.cabal-install.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; + }); + cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; }); # Jailbreaks & Version Updates diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index d412ac49aa68..5fb3ae9f6c02 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -55,9 +55,16 @@ self: super: { # 0.30 introduced support for GHC 9.2. cryptonite = doDistribute self.cryptonite_0_30; - # cabal-install needs more recent versions of Cabal - cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; + # cabal-install needs most recent versions of Cabal and Cabal-syntax + cabal-install = super.cabal-install.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; + }); + cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { + Cabal = self.Cabal_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; }); doctest = dontCheck (doJailbreak super.doctest); @@ -73,8 +80,8 @@ self: super: { assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; - base-compat = self.base-compat_0_12_1; - base-compat-batteries = self.base-compat-batteries_0_12_1; + base-compat = self.base-compat_0_12_2; + base-compat-batteries = self.base-compat-batteries_0_12_2; binary-instances = doJailbreak super.binary-instances; ChasingBottoms = doJailbreak super.ChasingBottoms; constraints = doJailbreak super.constraints; @@ -102,7 +109,7 @@ self: super: { ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; hackage-security = doJailbreak super.hackage-security; - hashable = super.hashable_1_4_0_2; + hashable = super.hashable_1_4_1_0; hashable-time = doJailbreak super.hashable-time; # 1.1.1 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hedgehog = assert super.hedgehog.version == "1.0.5"; doJailbreak super.hedgehog; @@ -146,7 +153,7 @@ self: super: { }) (doJailbreak super.hpack); # lens >= 5.1 supports 9.2.1 - lens = doDistribute self.lens_5_1_1; + lens = doDistribute self.lens_5_2; # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 alex = dontCheck super.alex; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 21cb8cc51a4a..af19c9121689 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4,6 +4,7 @@ broken-packages: - 3d-graphics-examples - 3dmodels - AAI + - aasam - abacate - abcnotation - abeson @@ -2660,6 +2661,7 @@ broken-packages: - intrinsic-superclasses - introduction - intro-prelude + - invertible - invertible-hlist - invertible-syntax - involutive-semigroups @@ -2868,6 +2870,7 @@ broken-packages: - lambda-toolbox - lame - lame-tester + - landlock - language-asn - language-c-comments - language-c-inline @@ -2966,6 +2969,7 @@ broken-packages: - libpq - librandomorg - librarian + - libsecp256k1 - libsystemd-daemon - libsystemd-journal - libtagc @@ -3489,6 +3493,7 @@ broken-packages: - next-ref - nextstep-plist - NGrams + - ngx-export-log - niagra - nibblestring - nice-html @@ -3820,6 +3825,7 @@ broken-packages: - phone-numbers - phone-push - phonetic-languages-constaints + - phonetic-languages-simplified-properties-array-old - phonetic-languages-vector - phraskell - Phsu @@ -4312,6 +4318,7 @@ broken-packages: - ReviewBoard - rewrite-inspector - rfc-prelude + - r-glpk-phonetic-languages-ukrainian-durations - rhbzquery - riak - riak-protobuf-lens diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index dfd932a074b7..72fda2b3a145 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -99,6 +99,7 @@ extra-packages: - Cabal == 2.4.* # required for cabal-install etc. - Cabal == 3.2.* # required for cabal-install etc. - Cabal == 3.4.* # required for cabal-install etc. + - Cabal == 3.6.* # required for cabal-install-parsers etc. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 08fd845a1b35..06627c6be687 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 19.18 +# Stackage LTS 19.19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -74,7 +74,7 @@ default-package-overrides: - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.12.0.1 + - arithmoi ==0.12.0.2 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 @@ -141,7 +141,7 @@ default-package-overrides: - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 - basement ==0.0.14 - - base-orphans ==0.8.6 + - base-orphans ==0.8.7 - base-prelude ==1.6.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 @@ -156,7 +156,7 @@ default-package-overrides: - bech32 ==1.1.2 - bech32-th ==1.1.1 - bench ==1.0.12 - - benchpress ==0.2.2.20 + - benchpress ==0.2.2.21 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 - between ==0.11.0.0 @@ -173,7 +173,7 @@ default-package-overrides: - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.2 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.2 + - binary-orphans ==1.0.3 - binary-parser ==0.5.7.2 - binary-parsers ==0.2.4.0 - binary-search ==2.0.0 @@ -266,8 +266,8 @@ default-package-overrides: - c14n ==0.1.0.2 - c2hs ==0.28.8 - cabal2spec ==2.6.2 - - cabal-appimage ==0.3.0.4 - - cabal-clean ==0.1.20210924 + - cabal-appimage ==0.3.0.5 + - cabal-clean ==0.1.20220814 - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-file-th ==0.2.7 @@ -303,7 +303,7 @@ default-package-overrides: - cborg-json ==0.2.4.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.1.3 - - cereal ==0.5.8.2 + - cereal ==0.5.8.3 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 @@ -682,7 +682,7 @@ default-package-overrides: - error-or-utils ==0.2.0 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.4.11 + - ersatz ==0.4.12 - esqueleto ==3.5.6.1 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 @@ -762,7 +762,7 @@ default-package-overrides: - fixed-length ==0.2.3 - fixed-vector ==1.2.1.0 - fixed-vector-hetero ==0.6.1.1 - - fix-whitespace ==0.0.8 + - fix-whitespace ==0.0.9 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 @@ -868,7 +868,7 @@ default-package-overrides: - getopt-generics ==0.13.0.4 - ghc-bignum-orphans ==0.1.1 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.6 + - ghc-check ==0.5.0.8 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-events ==0.17.0.3 @@ -886,7 +886,7 @@ default-package-overrides: - ghc-source-gen ==0.4.3.0 - ghc-syntax-highlighter ==0.0.7.0 - ghc-tcplugins-extra ==0.4.2 - - ghc-trace-events ==0.1.2.5 + - ghc-trace-events ==0.1.2.6 - ghc-typelits-extra ==0.4.3 - ghc-typelits-knownnat ==0.7.6 - ghc-typelits-natnormalise ==0.7.6 @@ -966,7 +966,7 @@ default-package-overrides: - guarded-allocation ==0.0.1 - hackage-cli ==0.0.3.6 - hackage-db ==2.1.2 - - hackage-security ==0.6.2.1 + - hackage-security ==0.6.2.2 - haddock-library ==1.10.0 - hadoop-streaming ==0.2.0.3 - hakyll ==4.15.1.1 @@ -1049,7 +1049,7 @@ default-package-overrides: - hid ==0.2.2 - hidapi ==0.1.8 - hie-bios ==0.9.1 - - hi-file-parser ==0.1.2.0 + - hi-file-parser ==0.1.3.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hindent ==5.3.4 @@ -1153,7 +1153,7 @@ default-package-overrides: - hspec-need-env ==0.1.0.9 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - - hspec-tmp-proc ==0.5.0.1 + - hspec-tmp-proc ==0.5.1.2 - hspec-wai ==0.11.1 - hs-php-session ==0.0.9.3 - hsshellscript ==3.5.0 @@ -1265,7 +1265,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1 - indexed-traversable ==0.1.2 - - indexed-traversable-instances ==0.1.1 + - indexed-traversable-instances ==0.1.1.1 - infer-license ==0.2.0 - inflections ==0.4.0.6 - influxdb ==1.9.2.2 @@ -1405,7 +1405,7 @@ default-package-overrides: - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - - libBF ==0.6.3 + - libBF ==0.6.4 - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 @@ -1413,7 +1413,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - - lifted-async ==0.10.2.2 + - lifted-async ==0.10.2.3 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.0.1 @@ -1524,7 +1524,7 @@ default-package-overrides: - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.10 - microspec ==0.2.1.3 - - microstache ==1.0.2.1 + - microstache ==1.0.2.2 - midair ==0.2.0.1 - midi ==0.2.2.3 - midi-alsa ==0.2.1 @@ -1753,7 +1753,7 @@ default-package-overrides: - pandoc-lua-marshal ==0.1.7 - pandoc-plot ==1.4.1 - pandoc-throw ==0.1.0.0 - - pandoc-types ==1.22.2 + - pandoc-types ==1.22.2.1 - pantry ==0.5.6 - parallel ==3.2.2.0 - parallel-io ==0.3.5 @@ -1859,7 +1859,7 @@ default-package-overrides: - polysemy-extra ==0.2.0.0 - polysemy-fs ==0.1.0.0 - polysemy-fskvstore ==0.1.1.0 - - polysemy-kvstore ==0.1.2.0 + - polysemy-kvstore ==0.1.3.0 - polysemy-methodology ==0.2.1.0 - polysemy-path ==0.2.1.0 - polysemy-plugin ==0.4.1.1 @@ -1970,7 +1970,7 @@ default-package-overrides: - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.27 + - quickcheck-instances ==0.3.28 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 @@ -1984,7 +1984,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.1 + - rampart ==2.0.0.2 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.1 @@ -2134,7 +2134,7 @@ default-package-overrides: - scotty ==0.12 - scrypt ==0.5.0 - sdl2 ==2.5.3.0 - - sdl2-ttf ==2.1.2 + - sdl2-ttf ==2.1.3 - search-algorithms ==0.3.2 - secp256k1-haskell ==0.6.1 - securemem ==0.1.10 @@ -2289,7 +2289,7 @@ default-package-overrides: - Spintax ==0.3.6 - splice ==0.6.1.1 - splint ==1.0.2.0 - - split ==0.2.3.4 + - split ==0.2.3.5 - splitmix ==0.1.0.4 - splitmix-distributions ==0.9.0.0 - split-record ==0.1.1.4 @@ -2326,7 +2326,7 @@ default-package-overrides: - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.7 + - stm-hamt ==1.2.0.8 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 @@ -2353,7 +2353,7 @@ default-package-overrides: - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.7 - - strict-tuple ==0.1.5 + - strict-tuple ==0.1.5.1 - strict-tuple-lens ==0.2 - strict-wrapper ==0.0.0.0 - stringbuilder ==0.5.1 @@ -2415,7 +2415,7 @@ default-package-overrides: - tardis ==0.4.4.0 - tasty ==1.4.2.3 - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.3.1 + - tasty-bench ==0.3.2 - tasty-dejafu ==2.0.0.8 - tasty-discover ==4.2.4 - tasty-expected-failure ==0.12.3 @@ -2542,7 +2542,7 @@ default-package-overrides: - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 - - tmp-proc ==0.5.0.1 + - tmp-proc ==0.5.1.2 - tophat ==1.0.5.1 - topograph ==1.0.0.1 - torsor ==0.1 @@ -2598,7 +2598,7 @@ default-package-overrides: - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - tz ==0.1.3.6 - - tzdata ==0.2.20220315.0 + - tzdata ==0.2.20220810.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 @@ -2725,7 +2725,7 @@ default-package-overrides: - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-delegate ==0.1.2.4 + - wai-middleware-delegate ==0.1.3.1 - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.2 - wai-rate-limit ==0.2.0.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index ce32dae48c36..0a5cc001f8a5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1391,6 +1391,7 @@ dont-distribute-packages: - fbrnch - fcd - feature-flipper-postgres + - fedora-composes - fedora-img-dl - feed-gipeda - feed-translator @@ -1575,6 +1576,7 @@ dont-distribute-packages: - gloss-devil - gloss-raster-accelerate - gloss-sodium + - gltf-loader - gmap - gmndl - gnome-desktop @@ -2278,6 +2280,7 @@ dont-distribute-packages: - interpolatedstring-qq-mwotton - introduction-test - intset + - invertible-hxt - ion - ipatch - ipc @@ -2663,6 +2666,7 @@ dont-distribute-packages: - mmsyn7l - mmsyn7s - mmsyn7ukr + - mmsyn7ukr-array - mmsyn7ukr-common - mmtl-base - moan @@ -2861,6 +2865,7 @@ dont-distribute-packages: - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys + - oplang - optima-for-hasql - optimal-blocks - optimusprime @@ -3578,6 +3583,7 @@ dont-distribute-packages: - stunts - stutter - stylist + - stylist-traits - subhask - substring-parser - sugar-data @@ -3918,6 +3924,7 @@ dont-distribute-packages: - warped - wavesurfer - wavy + - web-inv-route - web-mongrel2 - web-page - web-routes-regular diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4c1832e1a711..e89d77d5fa4e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -990,6 +990,42 @@ self: super: builtins.intersectAttrs super { enableSeparateBinOutput = true; }) super.nfc; + # Wants to execute cabal-install to (re-)build itself + hint = dontCheck super.hint; + + # Make sure that Cabal 3.8.* can be built as-is + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override { + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + process = self.process_1_6_15_0; + }); + + # cabal-install switched to build type simple in 3.2.0.0 + # as a result, the cabal(1) man page is no longer installed + # automatically. Instead we need to use the `cabal man` + # command which generates the man page on the fly and + # install it to $out/share/man/man1 ourselves in this + # override. + # The commit that introduced this change: + # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7 + # Since cabal-install 3.8, the cabal man (without the raw) command + # uses nroff(1) instead of man(1) for macOS/BSD compatibility. That utility + # is not commonly installed on systems, so we add it to PATH. Closure size + # penalty is about 10MB at the time of writing this (2022-08-20). + cabal-install = overrideCabal (old: { + executableToolDepends = [ + pkgs.buildPackages.makeWrapper + ] ++ old.buildToolDepends or []; + postInstall = old.postInstall + '' + mkdir -p "$out/share/man/man1" + "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1" + + wrapProgram "$out/bin/cabal" \ + --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.groff ]}" + ''; + hydraPlatforms = pkgs.lib.platforms.all; + broken = false; + }) super.cabal-install; + # haskell-language-server plugins all use the same test harness so we give them what we want in this loop. } // pkgs.lib.mapAttrs (_: overrideCabal (drv: { @@ -1021,7 +1057,4 @@ self: super: builtins.intersectAttrs super { hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; - - # Wants to execute cabal-install to (re-)build itself - hint = dontCheck super.hint; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bdbf8803137f..8ca53ae36bd0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -821,8 +821,8 @@ self: { pname = "Agda"; version = "2.6.2.2"; sha256 = "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"; - revision = "1"; - editedCabalFile = "0ahdsyrcrj0qm4zwsmcjrpq3a8w2yxp2hgpsjfl9b7a2b7k05pz2"; + revision = "2"; + editedCabalFile = "0mas4lsd093rg4w6js12cjmnz8227q5g0jhkhyrnr25jglqjz75n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2899,6 +2899,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_8_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers + , deepseq, directory, filepath, mtl, parsec, pretty, process, text + , time, transformers, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.8.1.0"; + sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base bytestring Cabal-syntax containers deepseq directory + filepath mtl parsec pretty process text time transformers unix + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -2937,6 +2957,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "Cabal-syntax_3_8_1_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, text, time + , transformers, unix + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.8.1.0"; + sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; + revision = "1"; + editedCabalFile = "0rmrcjpm169acfranqq04ach5g3jv7v6g45yzpwcp3ksk9g7cdj9"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty text time transformers unix + ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -3258,6 +3298,25 @@ self: { license = lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_12" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.12"; + sha256 = "1vy9yq07p95qiap1pcp2bbbn1mqvp3spyrswpdz0qfcn06656650"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "CheatSheet" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -9685,6 +9744,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; + revision = "1"; + editedCabalFile = "04y04vbxbnblpmqqmpl8km4bkcjaj96nbxkssdr1zgbhqisxay5q"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -10022,6 +10083,8 @@ self: { pname = "HaXml"; version = "1.25.9"; sha256 = "0ia27ffpdx59sa4mnyhks2bngrgaahwg150znnvnna30s9ncdfq1"; + revision = "1"; + editedCabalFile = "1p6v6ibkfbz4wklayzil9bmwsa0y5zcs9hzvl0qyjcnclpgalh7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11201,6 +11264,8 @@ self: { pname = "HsYAML"; version = "0.2.1.1"; sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; + revision = "1"; + editedCabalFile = "0jmbgrjywcblrd8k6zzv2b5givdz83f479y15v5gs0r93z25xpmv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11222,8 +11287,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "4"; - editedCabalFile = "0njrmdrjnw0i3km50wprfsqmimvqsi90p8kc47d3imgkp6fvcnik"; + revision = "5"; + editedCabalFile = "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12108,6 +12173,8 @@ self: { pname = "JuicyPixels-extra"; version = "0.5.2"; sha256 = "11y4735bbp99wvi4fkpvkda7cj4c6iqp437drs27flicx2ygc687"; + revision = "1"; + editedCabalFile = "1rmqhwbkdbwa2ng5zlpfwrfnqlcxrvgy3i5ymrjiw5jl9wp6j13c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -14879,8 +14946,8 @@ self: { }: mkDerivation { pname = "Network-NineP"; - version = "0.4.7.1"; - sha256 = "0gjscwrm4qjz662819g3l7i989ykxg3cka82kp23j5d2fy2sn2mc"; + version = "0.4.7.2"; + sha256 = "19m5iz99igw6bdqh9zln1cmfms0nrghvf9553fb2gjzv0i9dbygs"; libraryHaskellDepends = [ async base binary bytestring containers convertible exceptions hslogger monad-loops monad-peel mstate mtl network network-bsd @@ -15457,8 +15524,8 @@ self: { pname = "OneTuple"; version = "0.3.1"; sha256 = "1vry21z449ph9k61l5zm7mfmdwkwszxqdlawlhvwrd1gsn13d1cq"; - revision = "2"; - editedCabalFile = "0gk0656igxl0km9kgh8v7b5vq74kla59ka9hvpzq57njr6bc0j58"; + revision = "3"; + editedCabalFile = "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw"; libraryHaskellDepends = [ base base-orphans ghc-prim template-haskell ]; @@ -16865,6 +16932,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "PyF_0_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, ghc-boot + , hspec, HUnit, mtl, parsec, process, template-haskell, temporary + , text, time + }: + mkDerivation { + pname = "PyF"; + version = "0.11.0.0"; + sha256 = "0c5dahiad6rnr1v6s8mijyw9z5xhiip5ycrlwphq1wzm6prmx6ma"; + revision = "1"; + editedCabalFile = "091gbpmwhzvkmsk1kpsczwqb02vyw3603mqxflrajg9h2idgsdkd"; + libraryHaskellDepends = [ + base bytestring ghc ghc-boot mtl parsec template-haskell text time + ]; + testHaskellDepends = [ + base bytestring deepseq filepath hspec HUnit process + template-haskell temporary text time + ]; + description = "Quasiquotations for a python like interpolated string formatter"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { @@ -22872,6 +22962,24 @@ self: { mainProgram = "a50"; }) {}; + "aasam" = callPackage + ({ mkDerivation, base, containers, HUnit, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "aasam"; + version = "0.2.0.0"; + sha256 = "0bx5z0lms8c4n7v7z1piav2djsasnigd8f7i3vqzisgnsawvky6p"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit text + ]; + description = "Convert distfix precedence grammars to unambiguous context-free grammars"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "abacate" = callPackage ({ mkDerivation, base, HUnit, parsec, text }: mkDerivation { @@ -23816,6 +23924,8 @@ self: { pname = "acid-state"; version = "0.16.1.1"; sha256 = "05hcbk5dhwygc29b1jbyh2zzjrxybm44hj02wmv2bhz04b5wldca"; + revision = "2"; + editedCabalFile = "0q3z7mxahsv8wxlcm4wzqfd49im22j6lgxxd25mdrj59hzkfr6i7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24885,6 +24995,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "adjunctions_4_4_2" = callPackage + ({ mkDerivation, array, base, comonad, containers, contravariant + , distributive, free, generic-deriving, hspec, hspec-discover, mtl + , profunctors, semigroupoids, semigroups, tagged, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "adjunctions"; + version = "4.4.2"; + sha256 = "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql"; + libraryHaskellDepends = [ + array base comonad containers contravariant distributive free mtl + profunctors semigroupoids semigroups tagged transformers + transformers-compat void + ]; + testHaskellDepends = [ base distributive generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Adjunctions and representable functors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "adler32" = callPackage ({ mkDerivation, base, bytestring, hspec, zlib }: mkDerivation { @@ -25089,6 +25221,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-mp_0_2_10_0" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.10.0"; + sha256 = "1rrgij6wa0479pa2qr2fqylqlymg1xxsblrdp0ahmabdaazbdqd7"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck @@ -25109,6 +25263,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-real_0_2_10_0" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.10.0"; + sha256 = "08hfk0q6jmrjmkr9bj488lxjr7prkhc48ghfrk33flwk59zfgh3i"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as convergent sequences of intervals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson_1_5_6_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring @@ -25196,8 +25371,8 @@ self: { pname = "aeson"; version = "2.1.0.0"; sha256 = "151wyyw0ip0f2w4mfxcs58c26rsvhaac7s0yba76gnhnzbskwxha"; - revision = "1"; - editedCabalFile = "1zq5rnapvvrhfi4yy1xzi322h5zvmx0c3klpbrb08k92ykvfb98q"; + revision = "2"; + editedCabalFile = "0yp12cmkj5sz25kxzn6g1fz2d6acbq5rvff5dg2wg5zkjwfkhzqj"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist generically ghc-prim hashable @@ -25449,6 +25624,8 @@ self: { pname = "aeson-diff"; version = "1.1.0.13"; sha256 = "0sd13q0nj0k1sam5xfj6dcjcki18f375sa69hm6i4xc6snfhn3cb"; + revision = "1"; + editedCabalFile = "1028adallw7bm72948lj322bb5a99gfs0qc1j0pnm8hryp6n7ma5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -26099,8 +26276,8 @@ self: { }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.2.0"; - sha256 = "1akmvr6638rwmyqfs43clxbswdnpwrwb94zzq8whs4j01hkcly7w"; + version = "0.0.2.1"; + sha256 = "0fm2dkp0gi5h8xv6b3ax5v5ni7gkdvj8m2v1nrmf7hcyan0lp2aa"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -27459,27 +27636,27 @@ self: { }) {}; "algorithmic-composition-additional" = callPackage - ({ mkDerivation, algorithmic-composition-basic, base, bytestring - , directory, foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l - , mmsyn7ukr-common, phonetic-languages-simplified-base, process - , ukrainian-phonetics-basic-array + ({ mkDerivation, algorithmic-composition-basic, base, directory + , foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common + , phonetic-languages-basis, phonetic-languages-simplified-base + , process, ukrainian-phonetics-basic-array }: mkDerivation { pname = "algorithmic-composition-additional"; - version = "0.1.1.0"; - sha256 = "0j6qbfghx4i00ka0r8n8pw7m037qqn71vky794n3a06mfnisy8pb"; + version = "0.2.0.0"; + sha256 = "1qyvab2zk6zq86zcw11c481sw2pmi280hn241l4gj1pzlmnrjw1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algorithmic-composition-basic base bytestring directory foldable-ix + algorithmic-composition-basic base directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common - phonetic-languages-simplified-base process + phonetic-languages-basis phonetic-languages-simplified-base process ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - algorithmic-composition-basic base bytestring directory foldable-ix + algorithmic-composition-basic base directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common - phonetic-languages-simplified-base process + phonetic-languages-basis phonetic-languages-simplified-base process ukrainian-phonetics-basic-array ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; @@ -27489,18 +27666,18 @@ self: { }) {}; "algorithmic-composition-basic" = callPackage - ({ mkDerivation, base, bytestring, directory, foldable-ix - , mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common, process - , process-sequential, ukrainian-phonetics-basic-array-bytestring + ({ mkDerivation, base, directory, foldable-ix, mmsyn2-array, mmsyn3 + , mmsyn7l, mmsyn7ukr-common, process, process-sequential + , ukrainian-phonetics-basic-array }: mkDerivation { pname = "algorithmic-composition-basic"; - version = "0.5.0.0"; - sha256 = "0wd6fdx9wg92h8224xgwj0s4iawxx3abxpfjv8jz14fj6vk6hrzi"; + version = "0.6.0.0"; + sha256 = "0npazgs760bf1hsckp94mjyxf7q2nwirvi6n5rpibdkj9msb8bsy"; libraryHaskellDepends = [ - base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l + base directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common process process-sequential - ukrainian-phonetics-basic-array-bytestring + ukrainian-phonetics-basic-array ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; @@ -27508,20 +27685,20 @@ self: { }) {}; "algorithmic-composition-complex" = callPackage - ({ mkDerivation, algorithmic-composition-basic, base, bytestring - , directory, foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l - , mmsyn7ukr-common, phonetic-languages-simplified-base, process - , ukrainian-phonetics-basic-array-bytestring + ({ mkDerivation, algorithmic-composition-basic, base, directory + , foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common + , phonetic-languages-simplified-base, process + , ukrainian-phonetics-basic-array }: mkDerivation { pname = "algorithmic-composition-complex"; - version = "0.1.1.0"; - sha256 = "0gajyjjghhjgkjah0x139ca2010161rnkaxn22zgn8yikcdnr036"; + version = "0.2.0.0"; + sha256 = "19lp3slcqmz704ffqkh1m4kwp9aqapj20w8pmzkf43ndb57s9dz4"; libraryHaskellDepends = [ - algorithmic-composition-basic base bytestring directory foldable-ix + algorithmic-composition-basic base directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common phonetic-languages-simplified-base process - ukrainian-phonetics-basic-array-bytestring + ukrainian-phonetics-basic-array ]; description = "Helps to create more complex experimental music from a file (especially timbre)"; license = lib.licenses.mit; @@ -31456,8 +31633,8 @@ self: { }: mkDerivation { pname = "annotated-exception"; - version = "0.2.0.2"; - sha256 = "07njn6r1c3n1nblnlz5q2jrk5887vxxr2yzw4khqwayy0nmgbc7l"; + version = "0.2.0.4"; + sha256 = "090mv2a0k4mrhspa7wj62krl5m9y3c33nnr5m39qqdhgys37qrmb"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -32261,6 +32438,8 @@ self: { pname = "apecs"; version = "0.9.4"; sha256 = "0h4pdfh6c2cc9w13crn90rlllykv2axjfmxb74ji2l9m17m4w4vy"; + revision = "1"; + editedCabalFile = "1n0sz1230fp65dv462ss15yma6g1dxxlamj7idgl3kg9gdwv70sn"; libraryHaskellDepends = [ array base containers exceptions mtl template-haskell vector ]; @@ -32293,6 +32472,8 @@ self: { pname = "apecs-physics"; version = "0.4.5"; sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; + revision = "1"; + editedCabalFile = "0kzg82azksva8l13548qk4bkx5ww1z0ca1bv141gp4fr0vamw446"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -32320,6 +32501,8 @@ self: { pname = "apecs-stm"; version = "0.1.5"; sha256 = "10zfmc1zgmw5fkrrcs0mnsb2h44b0zfn2y7w1ld47skvmz580dxp"; + revision = "1"; + editedCabalFile = "01rhwqs69bx09p2nqp9c01jhcqnfdfiisw6kck9gjq0h68j2rdib"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -33640,8 +33823,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.12"; - sha256 = "0amgkbycbpr8zhpn7l1a68ddhrvz1rcr74gi0znhx0y3vspns7v8"; + version = "0.12.0.1"; + sha256 = "1a2gabg8v28jcl1nddj4pfmpwc57g68i0qnnx3p26k3psrkmy6xq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34308,8 +34491,8 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.12.0.1"; - sha256 = "1dsa0fw6z6b6gcsw23j08qayqyh2icya7gmb4v4r0adszr2p7ziz"; + version = "0.12.0.2"; + sha256 = "03mxkzcg2pik4p1ik648h3w953zmf47ycafm2gd7hgg4gadsnslj"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -34436,14 +34619,16 @@ self: { }) {}; "array-builder" = callPackage - ({ mkDerivation, array-chunks, base, primitive, run-st, tasty - , tasty-hunit + ({ mkDerivation, array-chunks, base, bytebuild, byteslice + , primitive, run-st, tasty, tasty-hunit, text-short }: mkDerivation { pname = "array-builder"; - version = "0.1.1.0"; - sha256 = "0g9mpplq813b33yfgfa095k2vnrxnj8lhxvw60qc6jky6l9q0inq"; - libraryHaskellDepends = [ array-chunks base primitive run-st ]; + version = "0.1.2.0"; + sha256 = "13km1jpr1wwvy2c43b3176hvj2a539758cpcgvqfy36gxxaasffw"; + libraryHaskellDepends = [ + array-chunks base bytebuild byteslice primitive run-st text-short + ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; license = lib.licenses.bsd3; @@ -35582,8 +35767,8 @@ self: { pname = "assoc"; version = "1.0.2"; sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; - revision = "2"; - editedCabalFile = "17jd3668y4j3kwsqgzqjrxymbglhgzgjbkda48djlbhppkzd3ng0"; + revision = "3"; + editedCabalFile = "0mrb12dx316q4gxyn68x2rl8jq0gd77zffd12r8j1r41l0xd9f4k"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -35805,8 +35990,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "1"; - editedCabalFile = "1w3hlcaq444qid3iqizb8sdl08jxwjmcfgfxqs2dw81mllsfqgdq"; + revision = "2"; + editedCabalFile = "1j93w1krkadqijn59yjiws1366yhcn2mad1irqrk50in6l10k51b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -36543,8 +36728,8 @@ self: { pname = "attenuation"; version = "0.2.0"; sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; - revision = "2"; - editedCabalFile = "1ns7cxvx33xfsr66xsiaba2kbdvd3ypbbbj0mjlhw76pnhpdyc5f"; + revision = "3"; + editedCabalFile = "1kg8pqm1ry2nm6182ncj17dfgfxvhw7px460b0kx6j6gy3p0r6l9"; libraryHaskellDepends = [ base constraints ]; description = "Subtyping relations and variance roles"; license = lib.licenses.asl20; @@ -36679,8 +36864,8 @@ self: { pname = "attoparsec"; version = "0.14.4"; sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; - revision = "1"; - editedCabalFile = "149ihklmwnl13mmixq6iq5gzggkgqwsqrjlg2fshqwwbvbd4nn3r"; + revision = "2"; + editedCabalFile = "00jyrn2asz1kp698l3fyh19xxxz4npf1993y041x9b9cq239smn0"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -37231,6 +37416,8 @@ self: { pname = "authenticate-oauth"; version = "1.7"; sha256 = "0y4v46rn0cvm0sr1v8qq1zgzllrlrr3ji5gij1xprgf1zsazcvvl"; + revision = "1"; + editedCabalFile = "198xm2qdaqwg2m9kgrkw5gdk2bh19mmj6c4d5fsbpcjnhxlh6axg"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -38072,8 +38259,8 @@ self: { pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.11"; sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9"; - revision = "2"; - editedCabalFile = "1i8zyr3kz1cm8ygzpkvxyfqzlnykkwsfa41yrb5k89729fw51dnm"; + revision = "3"; + editedCabalFile = "0vbrsfqb4ndcw221pqnprb8a7ymn8x92q7d0rwms9rkxpfbd0wyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39855,12 +40042,12 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat_0_12_1" = callPackage + "base-compat_0_12_2" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; - version = "0.12.1"; - sha256 = "1z8ml19jsq616d9ggxly99rjqd3bsbmp17w4s2qwm20v0js3qs7v"; + version = "0.12.2"; + sha256 = "1gah466nd6hkj716gwljfh0g270iaqy2rq2a1vw3di2s7a4dqam6"; libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; @@ -39882,16 +40069,14 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat-batteries_0_12_1" = callPackage + "base-compat-batteries_0_12_2" = callPackage ({ mkDerivation, base, base-compat, ghc-prim, hspec, hspec-discover , QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.12.1"; - sha256 = "12w3bpsz3xykhibc8wkhiii9nav7yxhlv424cy1b9v9ihbfkr3zr"; - revision = "2"; - editedCabalFile = "0p522rvawkpyr12jwa0cikpqihvq2xd99nr95l0s3zdjf1srv0gf"; + version = "0.12.2"; + sha256 = "16gbqng8556wqcvrmj3dmqxh9sxp7z6ixgv0j5sy017r0wp0ksgd"; libraryHaskellDepends = [ base base-compat ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -39990,8 +40175,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8.6"; - sha256 = "1sqmh3x07aw2l2vzj8dhhs1a41kl8r0n46ayn92dh3yvg95ir8i0"; + version = "0.8.7"; + sha256 = "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -40435,11 +40620,25 @@ self: { pname = "basement"; version = "0.0.14"; sha256 = "01kk3z0c48c2jhni8ba165zxzm4sljy18r97cad1yd897qjsy2mv"; + revision = "2"; + editedCabalFile = "16q5ilgblwhdhwxq8p76dp3c3gm55b6scgswx863zpjyca5avaif"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; }) {}; + "basement_0_0_15" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.15"; + sha256 = "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "basement-cd" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -40762,8 +40961,8 @@ self: { pname = "batching"; version = "0.1.0.0"; sha256 = "1mks6w3zfvkdgi9didf94jp1hac9ps4pli75vn79p9hxjwc2fm27"; - revision = "2"; - editedCabalFile = "1ym25swz7hgfw7x2z55bmq8z3j9p22ln9z67lcdkc9sq4bfv0a8x"; + revision = "3"; + editedCabalFile = "1gahl1kia0ivs12hms380fjk1jdpnmrbns2kgf3csznfc7nbkv1c"; libraryHaskellDepends = [ base primitive short-vec sint ]; testHaskellDepends = [ base primitive QuickCheck short-vec sint test-framework @@ -41649,8 +41848,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.20"; - sha256 = "0yh44hdk7gh6ygdlys2mrij2gphdv5da8hmc7rnyf6cr5509ynn8"; + version = "0.2.2.21"; + sha256 = "1rbkryxrzgzas7vv4rpxy718rgpmpmklnlmz91f09bn0qm8zdnnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -42732,10 +42931,8 @@ self: { }: mkDerivation { pname = "binary-orphans"; - version = "1.0.2"; - sha256 = "0q7yk3m275lcmar1dsrz009xasw34755cjrb6f2h4kkymy93qjsz"; - revision = "1"; - editedCabalFile = "01arf4sm4srri0iahvlzr2x2nzda7dnii1rwadlgaql5ns2ckazz"; + version = "1.0.3"; + sha256 = "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2"; libraryHaskellDepends = [ base binary OneTuple transformers ]; testHaskellDepends = [ base binary OneTuple QuickCheck quickcheck-instances tagged tasty @@ -43997,8 +44194,8 @@ self: { }: mkDerivation { pname = "binsm"; - version = "0.1.2"; - sha256 = "1nhdzy3hqqin67i25kgrrcny99lrdr9i6xddr8gjm6b32kqhakhw"; + version = "0.1.3"; + sha256 = "1id0gfgi4vsv8vi5dlvgcgc41ml5sywawzw1v4f1bcq92qirczkc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45068,6 +45265,8 @@ self: { pname = "bits-extra"; version = "0.0.2.3"; sha256 = "1lyrr5jg8yg9cb97pn1pd4qgc7qn3irv8k5ra5j48fyn1rb6z4r7"; + revision = "1"; + editedCabalFile = "188qhzlknv8drhza7jn896wfxd043yipzax3vmrqldwhl88yn2aw"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog @@ -45927,8 +46126,8 @@ self: { pname = "blaze-markup"; version = "0.8.2.8"; sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23"; - revision = "2"; - editedCabalFile = "074zslyx5dxzz242n5rzhgdw9i58akrkm2jd37wazbk3062a7mrq"; + revision = "3"; + editedCabalFile = "1hn694kk615prqdn7bfzl0wvbw8bksxk4cxwmx8yhwpl0cq3fiwa"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -48094,7 +48293,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_1_0" = callPackage + "brick_1_1" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48103,8 +48302,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "1.0"; - sha256 = "00r0slc0yvzr789q71dr0cbixy4bw73qsiv5mldpc4f2q5sj10bk"; + version = "1.1"; + sha256 = "1mnlm0vbbldih1h0i07mriqsinfkjqqkbrsyk2z20fa9wb8cam3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51102,8 +51301,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.3.0.4"; - sha256 = "1plgswf3mrkdn6fysghbmkcnjjk00afvlyb39m7h92vwxwxkv6yl"; + version = "0.3.0.5"; + sha256 = "1kc038ig8a3pl71fa8415ycwhm3amy9q30cfr17vlbhjh2lcfz2y"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3Only; @@ -51269,8 +51468,8 @@ self: { }: mkDerivation { pname = "cabal-clean"; - version = "0.1.20210924"; - sha256 = "11r46rfncgp8gmvvsfp64krdnp0q4rykrhv5z2gwrxyv5sjkfpyz"; + version = "0.1.20220814"; + sha256 = "10kw1d6gxksgawpklqmjhbdc507zcxsghnf6vjwiv2wikrmz8b0d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51282,6 +51481,28 @@ self: { mainProgram = "cabal-clean"; }) {}; + "cabal-clean_0_2_20220819" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , mtl, optparse-applicative, pretty-terminal, process, silently + , split, string-qq + }: + mkDerivation { + pname = "cabal-clean"; + version = "0.2.20220819"; + sha256 = "17zrny2wyqfvyjdsqj6z18cdq66ycj66i6mpr122paa08608kyrn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory filemanip filepath mtl + optparse-applicative pretty-terminal process silently split + string-qq + ]; + description = "Remove outdated cabal build artefacts from `dist-newstyle`"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-clean"; + }) {}; + "cabal-constraints" = callPackage ({ mkDerivation, base, Cabal, optparse-applicative }: mkDerivation { @@ -51424,8 +51645,8 @@ self: { pname = "cabal-doctest"; version = "1.0.9"; sha256 = "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"; - revision = "1"; - editedCabalFile = "0dw9h3zqivzzisjz0g3ccb10fwz858dhvy6hvwm5i1sj80wm8imd"; + revision = "2"; + editedCabalFile = "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for running doctests"; license = lib.licenses.bsd3; @@ -51687,26 +51908,38 @@ self: { "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, deepseq - , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, lukko, mtl, network-uri, parsec, pretty, process - , random, regex-base, regex-posix, resolv, stm, tar, text, time - , transformers, unix, zlib + , bytestring, Cabal, Cabal-described, cabal-install-solver + , Cabal-QuickCheck, Cabal-syntax, Cabal-tree-diff, containers + , cryptohash-sha256, directory, echo, edit-distance, exceptions + , filepath, hackage-security, hashable, HTTP, lukko, mtl + , network-uri, parsec, pretty, pretty-show, process, QuickCheck + , random, regex-base, regex-posix, resolv, safe-exceptions, stm + , tagged, tar, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.6.2.0"; - sha256 = "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"; - revision = "1"; - editedCabalFile = "0891zma6ci26ndbb98mahps0dxy7zccj3mqa9d194j3d305hs9av"; - isLibrary = false; + version = "3.8.1.0"; + sha256 = "1rk7xb86c1vgarv1m16d2i82fiig6q119j51gvq2pq8l5rpl7kk1"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP lukko mtl network-uri - parsec pretty process random regex-base regex-posix resolv stm tar - text time transformers unix zlib + cabal-install-solver Cabal-syntax containers cryptohash-sha256 + directory echo edit-distance exceptions filepath hackage-security + hashable HTTP lukko mtl network-uri parsec pretty process random + regex-base regex-posix resolv safe-exceptions stm tar text time + unix zlib + ]; + executableHaskellDepends = [ + base Cabal Cabal-syntax directory filepath + ]; + testHaskellDepends = [ + array base bytestring Cabal Cabal-described cabal-install-solver + Cabal-QuickCheck Cabal-syntax Cabal-tree-diff containers directory + filepath hashable mtl network-uri pretty-show QuickCheck random + tagged tar tasty tasty-expected-failure tasty-golden tasty-hunit + tasty-quickcheck time tree-diff zlib ]; doCheck = false; postInstall = '' @@ -51715,9 +51948,12 @@ self: { ''; description = "The command-line interface for Cabal and Hackage"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cabal"; maintainers = [ lib.maintainers.peti ]; - }) {}; + broken = true; + }) {Cabal-QuickCheck = null; Cabal-described = null; + Cabal-tree-diff = null;}; "cabal-install-bundle" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers @@ -51813,6 +52049,26 @@ self: { license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; + "cabal-install-solver" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax + , containers, edit-distance, filepath, mtl, pretty, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "cabal-install-solver"; + version = "3.8.1.0"; + sha256 = "1rzzi3jx5ivxy43vdg460fsbn1p2v5br1havcara65vmqgv6j8yz"; + libraryHaskellDepends = [ + array base bytestring Cabal Cabal-syntax containers edit-distance + filepath mtl pretty transformers + ]; + testHaskellDepends = [ + base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck + ]; + description = "The command-line interface for Cabal and Hackage"; + license = lib.licenses.bsd3; + }) {}; + "cabal-lenses" = callPackage ({ mkDerivation, base, Cabal, lens, strict, system-fileio , system-filepath, text, transformers, unordered-containers @@ -53714,6 +53970,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; + revision = "1"; + editedCabalFile = "1ilnax8c71xvj84a36c91l3ypcil1f6kbadssv0fz2n2c4m6r7g6"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control mtl mutable-containers primitive reflection safe-exceptions @@ -55663,10 +55921,8 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.8.2"; - sha256 = "0kvnlm22qdmb7g2jz7imsvh799q4nvms1ni0cbba5vigp5ai64hp"; - revision = "1"; - editedCabalFile = "16hdvwa1qpwicn512mnsksi4zdnwmqnn9sdga4iy3jza4rj9lzgy"; + version = "0.5.8.3"; + sha256 = "0shg3q933cvf18j1gmxill48d4sl4mvxj2qkj6yya9hvcqh5544r"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -58809,8 +59065,8 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.3.0"; - sha256 = "1iprssnpxykh9fjgckjnh5qlmnf1drgzjjfcq9fxyqs755y38vbi"; + version = "0.3.1"; + sha256 = "1paym4vsihwggml62m0ijlln9349p4yrcpg6bvh6i199h3qs78id"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -59442,6 +59698,8 @@ self: { pname = "cleff"; version = "0.3.3.0"; sha256 = "0fnpk28nhafypp7p1ay1760sin9hh06dz23r68gmm93i879ayl9b"; + revision = "1"; + editedCabalFile = "1g3y1sh1rg7calrpr5l5rmm4hdyqbni59hm10dkb62xb23v5p6mq"; libraryHaskellDepends = [ atomic-primops base containers exceptions microlens monad-control primitive template-haskell th-abstraction transformers-base @@ -61936,8 +62194,8 @@ self: { pname = "collate"; version = "0.1.0.0"; sha256 = "1fh335mwk51gyhyxilv83z66ilz5ws3ni8cbr4qmpfpgf9m1jp5s"; - revision = "1"; - editedCabalFile = "1456p4dqfmlzf0sagga050f7zrp1rns129q0d9hia8yipmf16j0v"; + revision = "2"; + editedCabalFile = "08jzbmws1mj9cchn59pnbyrkia4kzz02sl8jhp7rmby2irm9vx1x"; libraryHaskellDepends = [ base containers lens primitive transformers vector ]; @@ -65793,10 +66051,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "1.2.2.0"; - sha256 = "10mp76j2gxcb51865lb6cf3nkc2nc7fwarkghb6yz71q6sbrg3yx"; - revision = "2"; - editedCabalFile = "0i9r3a4xakq8a92gh10f8g885z0znnaadwz3sc1x7z0367bfsygg"; + version = "1.3.0.0"; + sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -65829,8 +66085,8 @@ self: { }: mkDerivation { pname = "config-value"; - version = "0.8.2.1"; - sha256 = "1kqkh5w4q8k2r9gab2x4grsbgx7gi18fabg7laiwpl3dm2acmz7k"; + version = "0.8.3"; + sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -66000,8 +66256,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.6"; - sha256 = "0zlj733fyw0iiczjzzp9mlgywd175crp853wyp9b1gq1m2j6vxnm"; + version = "0.2.7"; + sha256 = "17ik5vl6zriqgp7fxkv60l6jcfnh842rw5254ly3wy2c13nk9h4f"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -67951,6 +68207,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_6_0" = 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.6.0"; + sha256 = "17x6dkrrps7cwh232fhmwn1r06xn28ghxysw26rba44lwshc9wga"; + 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -68016,16 +68290,16 @@ self: { ({ mkDerivation, async, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl , network-info, random, safe-exceptions, scientific, stm - , template-haskell, text, time, unix, zlib + , template-haskell, text, time, unix, uuid-types, zlib }: mkDerivation { pname = "core-telemetry"; - version = "0.2.5.0"; - sha256 = "1wl9ijgbn6qjivl2yv7y9brh80rfissxhzqj6564bl9lhncjqdyp"; + version = "0.2.6.0"; + sha256 = "04a0blnkap9mdlryikvn5dri60k0dvhkbbp9112p8417ywp0gsh7"; libraryHaskellDepends = [ async base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions - scientific stm template-haskell text time unix zlib + scientific stm template-haskell text time unix uuid-types zlib ]; description = "Advanced telemetry"; license = lib.licenses.mit; @@ -68417,8 +68691,8 @@ self: { }: mkDerivation { pname = "country"; - version = "0.2.2"; - sha256 = "149j83j8y7q078azsbq4clrmgcd95w3980fs2dfqg7hmmiff8gcm"; + version = "0.2.3"; + sha256 = "12d1nymfj13jgh5jhznrg8sgxvxyb2y3lvbl6p4mpa3qqhggyr3g"; libraryHaskellDepends = [ aeson attoparsec base bytebuild bytehash byteslice bytestring contiguous deepseq entropy hashable primitive primitive-unlifted @@ -69597,6 +69871,45 @@ self: { mainProgram = "criterion-report"; }) {}; + "criterion_1_6_0_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-chart + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.6.0.0"; + sha256 = "1c2jl881bb3g4w037dx4bs3s164s306vayw2jxd9k3hmrnffyaa0"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-chart microstache mtl mwc-random optparse-applicative parsec + statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "criterion-report"; + }) {}; + "criterion-cmp" = callPackage ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava , containers, filepath, optparse-applicative, vector @@ -69657,6 +69970,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion-measurement_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, base-compat, binary, containers + , deepseq, vector + }: + mkDerivation { + pname = "criterion-measurement"; + version = "0.2.0.0"; + sha256 = "1cyanb4w3p2nr5vfqdl8s3abqh0avnpqxnjhfanj7vj18gbm06ja"; + libraryHaskellDepends = [ + aeson base base-compat binary containers deepseq vector + ]; + description = "Criterion measurement functionality and associated types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -70268,8 +70597,8 @@ self: { pname = "crypto-rng-effectful"; version = "1.0.0.0"; sha256 = "185ax4v4bfg944igscjg0vb0p15af4vwqdfn239x6xayfgy4xzl0"; - revision = "2"; - editedCabalFile = "1jzfinvkwssplxrnpg8f9nckzabbzajbsfq4r675fvkv2h98ikz0"; + revision = "3"; + editedCabalFile = "1cq7df3mrj5v7v3l4c28ppd8zczkdsmjbzazcnk47i83nhaqdxxz"; libraryHaskellDepends = [ base bytestring crypto-rng effectful-core random ]; @@ -70466,6 +70795,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; + revision = "1"; + editedCabalFile = "0s2f5cd46lqymmbpcnzlxsim5qk8yrr52j5mmi31zrhd24b3bqln"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -70484,6 +70815,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; + revision = "1"; + editedCabalFile = "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -70502,6 +70835,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.1"; sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; + revision = "1"; + editedCabalFile = "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -70523,6 +70858,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.101.0"; sha256 = "0a6sc5b6w0k47fyjhyrfm3p25jsbsqjknfq5mbj53p2p1qsfykc1"; + revision = "1"; + editedCabalFile = "1mjbn84bg9r3m1dcfpmmalck2wdfdm4i8wrqfi624mbaqs8a0fqs"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -71820,8 +72157,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.2.1"; - sha256 = "1ii7q63pr3zazkb76j1912yjzamj62h3ilqpszypq5s27vfs2yb4"; + version = "0.2.2"; + sha256 = "112ppmjf2dw7d26a0bxydp33fa0l2qx5absqq5hi0jsqrjx2lqj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73712,8 +74049,8 @@ self: { pname = "data-fix"; version = "0.3.2"; sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; - revision = "2"; - editedCabalFile = "0ymn341kg2c1wf1vp04v25bpnf857krhv91q4kl7b2k4h5ipf2g9"; + revision = "3"; + editedCabalFile = "0z77i9y86wlc13396akl8qxq39rwpkhhcs5fadzk47bwn7v1gsmx"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -75472,7 +75809,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_2_25" = callPackage + "dbus_1_2_26" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -75481,8 +75818,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.25"; - sha256 = "10qijlyr7aj4f92ci6728rkhng1w8ng7l3csm2rs27dqvafhs3qy"; + version = "1.2.26"; + sha256 = "1c9ljbwcrnzlbrjjp7bgpwbwykm03qvha05h55yp8k11za03wh9i"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -76376,8 +76713,8 @@ self: { pname = "decision-diagrams"; version = "0.2.0.0"; sha256 = "0l03mwig95h300rn1cfhd5ahwrlap6zsw09lwmkx6wkw6rjf4a5s"; - revision = "1"; - editedCabalFile = "12wki53kzfry2fh8039zvs0ifkzcz48vkg9ks8ycb60sjqqqf1cl"; + revision = "2"; + editedCabalFile = "0hp3k385p5lngfa3v3g8rnf34d3x0drk8i76mlk2c9bmbsl9dmfh"; libraryHaskellDepends = [ base containers hashable hashtables intern mwc-random primitive random reflection unordered-containers vector @@ -77285,6 +77622,8 @@ self: { pname = "dependent-literals"; version = "0.2.0"; sha256 = "1i3mzijqk2pf7am9kh1ydhrw9qj1ijfq8kwvxhrqcx28kaz63rvd"; + revision = "1"; + editedCabalFile = "06idgw3i8b7zp55ram7rkg2vpdb1qkyp1ywq98246d3qfq8zkddk"; libraryHaskellDepends = [ base fin-int numeric-kinds sint snumber tagged type-compare wrapped ]; @@ -77300,6 +77639,8 @@ self: { pname = "dependent-literals-plugin"; version = "0.1.0.2"; sha256 = "0bllcf19psak7sfhlqh78lbrdgx3ylqislrvdhjc9syvhaw5khq1"; + revision = "1"; + editedCabalFile = "14325kanxwarm8x84b6pcr7ym62bqblvpl1a25xhy0jyxgwqhl6j"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint @@ -78470,29 +78811,28 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; - "dhall_1_41_1" = callPackage + "dhall_1_41_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg , cborg-json, containers, contravariant, cryptohash-sha256 , data-fix, deepseq, Diff, directory, doctest, dotgen, either , exceptions, filepath, foldl, gauge, generic-random, half , hashable, haskeline, http-client, http-client-tls, http-types - , lens-family-core, megaparsec, mmorph, mockery, mtl, network-uri - , optparse-applicative, parser-combinators, parsers, pretty-simple - , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, serialise + , indexed-traversable, lens-family-core, megaparsec, mmorph + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise , special-values, spoon, system-filepath, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-silver, template-haskell, temporary, text, text-manipulate - , th-lift-instances, time, transformers, turtle + , text-short, th-lift-instances, time, transformers, turtle , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.41.1"; - sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv"; - revision = "3"; - editedCabalFile = "0x4dkfg3257c4vq05ca7jcyk7p446djzzwwc5j509wj23mrqf30h"; + version = "1.41.2"; + sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78501,50 +78841,52 @@ self: { base16-bytestring bytestring case-insensitive cborg cborg-json containers contravariant cryptohash-sha256 data-fix deepseq Diff directory dotgen either exceptions filepath half hashable haskeline - http-client http-client-tls http-types lens-family-core megaparsec - mmorph mtl network-uri optparse-applicative parser-combinators - parsers pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors repline scientific serialise template-haskell text - text-manipulate th-lift-instances time transformers - unordered-containers uri-encode vector + http-client http-client-tls http-types indexed-traversable + lens-family-core megaparsec mmorph mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unordered-containers + uri-encode vector ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base base16-bytestring bytestring case-insensitive cborg cborg-json containers contravariant data-fix deepseq Diff directory dotgen - either exceptions filepath half hashable haskeline lens-family-core - megaparsec mmorph mtl network-uri optparse-applicative - parser-combinators parsers pretty-simple prettyprinter - prettyprinter-ansi-terminal profunctors repline scientific - serialise template-haskell text text-manipulate th-lift-instances - time transformers unordered-containers uri-encode vector + either exceptions filepath half hashable haskeline + indexed-traversable lens-family-core megaparsec mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unordered-containers + uri-encode vector ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base base16-bytestring bytestring case-insensitive cborg cborg-json containers contravariant data-fix deepseq Diff directory doctest dotgen either exceptions filepath foldl generic-random half - hashable haskeline http-client http-client-tls lens-family-core - megaparsec mmorph mockery mtl network-uri optparse-applicative - parser-combinators parsers pretty-simple prettyprinter - prettyprinter-ansi-terminal profunctors QuickCheck + hashable haskeline http-client http-client-tls indexed-traversable + lens-family-core megaparsec mmorph mockery mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors QuickCheck quickcheck-instances repline scientific serialise special-values spoon system-filepath tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-silver template-haskell temporary text - text-manipulate th-lift-instances time transformers turtle - unordered-containers uri-encode vector + text-manipulate text-short th-lift-instances time transformers + turtle unordered-containers uri-encode vector ]; benchmarkHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base base16-bytestring bytestring case-insensitive cborg cborg-json containers contravariant data-fix deepseq Diff directory dotgen either exceptions filepath gauge half hashable haskeline - lens-family-core megaparsec mmorph mtl network-uri - optparse-applicative parser-combinators parsers pretty-simple - prettyprinter prettyprinter-ansi-terminal profunctors repline - scientific serialise template-haskell text text-manipulate - th-lift-instances time transformers unordered-containers uri-encode - vector + indexed-traversable lens-family-core megaparsec mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unordered-containers + uri-encode vector ]; doCheck = false; description = "A configuration language guaranteed to terminate"; @@ -78632,10 +78974,8 @@ self: { }: mkDerivation { pname = "dhall-csv"; - version = "1.0.2"; - sha256 = "08m9gjjldbzbgqr7vb33xjnzn7vmhf8gp9zh73vvzbchflwgh48p"; - revision = "1"; - editedCabalFile = "08zavv7bpb4033imzqmbxpxh51a3srcy58h85k4nmii73xv1iwzg"; + version = "1.0.3"; + sha256 = "1ynlyxj585v7ngsladl4dxl7pzkq0sb1j99xzzzn0nbj7x0jigbr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78666,8 +79006,8 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.9"; - sha256 = "1va5bv7jz3msp39l782qbc1m3n5wnjdqx4jsj9vqdydqbfsk8gri"; + version = "1.0.10"; + sha256 = "1rh6nxmjin8kvbscbhbcjsgxnlkw1r19plzpps6wkx86zfjd2ms2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78756,7 +79096,7 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; - "dhall-json_1_7_10" = callPackage + "dhall-json_1_7_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -78765,10 +79105,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.10"; - sha256 = "11gpsgd3aafqh9v10gib7yivy3dp7dhd1a3dslf2ivc7na3d8p71"; - revision = "1"; - editedCabalFile = "1dhs90y4jn2ipc1x0srd3a5qrgh0pj0laqd7mmqgwr3l9f0p19g6"; + version = "1.7.11"; + sha256 = "0a7gcnx5xm2b1kvprvxlm7bjk68c30qs8cy3596pyngw7grsrhi6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78818,10 +79156,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.1.1"; - sha256 = "0z4gc27fpz1pcjbajwpxgn0zhxlp9xp47lyg55p03ghfpqa2mcl6"; - revision = "3"; - editedCabalFile = "0lb51q09fdsnwlfsgna8ssv3434w550kla193kslbrmx5vsi04kp"; + version = "1.1.2"; + sha256 = "1wrbi22i276wf9yw4ljxri602213fyl08zbk978l13zxglnrj4zh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78866,14 +79202,14 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; - "dhall-nix_1_1_24" = callPackage + "dhall-nix_1_1_25" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.24"; - sha256 = "1zaqzccrj3yn502k1b9drs882ycxw59m3jgsbafj6fny1v5ljcha"; + version = "1.1.25"; + sha256 = "1541h6hym254dycq6h40rqn82qbk74d071k67hf62aqd9l2g4y6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78898,10 +79234,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.8"; - sha256 = "1jr9njnly63d5bzd9np7hijmczkwamb4j2k14h647h6i3hhkxh8n"; - revision = "1"; - editedCabalFile = "0navmlh0yh3abk114x7grv7rcbxxvk1yvh3lvnwc23qq6gm34r79"; + version = "1.0.9"; + sha256 = "1j0i2qhizmzhz2l46xwklgkki6nqa6imzdqdfm6xy3gkfdlna753"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78923,10 +79257,8 @@ self: { }: mkDerivation { pname = "dhall-openapi"; - version = "1.0.4"; - sha256 = "1hvjilm1hjq4963l7xnr1r35x023pgddv0l3bvfgryd58zv728ah"; - revision = "2"; - editedCabalFile = "1vb7hka8iwprl555zl20z6wgl1zkah6bj02b9r0x6b99mds463x0"; + version = "1.0.5"; + sha256 = "1sfsjvpq28nv3njf3flki3wawm0flbdwz08x4qiv6bmki3yijpxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79091,6 +79423,36 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall-yaml_1_2_11" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.2.11"; + sha256 = "1iqn9gign1y9cysdghxip4gpcp3x4knirlnm3mkin7zbr9hhxflh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -79281,8 +79643,8 @@ self: { }: mkDerivation { pname = "diagnose"; - version = "2.3.1"; - sha256 = "09xyhg735pdws5gck2893gh1rhcx1xirv0n3kchgll9q19wh533l"; + version = "2.4.0"; + sha256 = "08y6r3kbrql2ysyrs81h9rdp3ifg9sln9l4bvcmk3hcscifgglgg"; libraryHaskellDepends = [ array base data-default dlist hashable prettyprinter prettyprinter-ansi-terminal text unordered-containers wcwidth @@ -79395,8 +79757,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2"; sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; - revision = "1"; - editedCabalFile = "1pcc4vh1sb6h4bq4x2nxpynjvmif2bn1w3ddi24jbjhgr5b6ln59"; + revision = "2"; + editedCabalFile = "0hn1bbssknzqz3b8r281d4ibzv3fx3n33vaqcixajhcb87wnsi10"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -81578,6 +81940,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; + revision = "1"; + editedCabalFile = "0mlask4a08z0bkns89857vj96cqdqvdxqf5q7qsa0kpdaqkwrjz9"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -82817,8 +83181,8 @@ self: { }: mkDerivation { pname = "dnf-repo"; - version = "0.1"; - sha256 = "1xsicihfdvygqpnham4y0cixd07iyh4mxcjrmbivrc3mglb3qgf2"; + version = "0.3"; + sha256 = "0x2x6sapghvm4006iplk750ihign5akl1mlrga79k8f81krb3i3s"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -82886,8 +83250,8 @@ self: { }: mkDerivation { pname = "dns-patterns"; - version = "0.1.1"; - sha256 = "1x2qrn4nvpvmxyby0p6mcgicz3xspd7x390gnz6p7vpanx72r0w3"; + version = "0.1.3"; + sha256 = "01373vx919s6xznifc0nv9dlwnqh8j0h57v0pdzmpfa5z7jyq7vf"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; @@ -83049,8 +83413,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.13.0.0"; - sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5"; + version = "0.13.1.0"; + sha256 = "1k5jlzhbkh2ksk2y9iinsrsiwjcln7d077zcba8rjygq3d0gga9p"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = lib.licenses.mit; @@ -83061,8 +83425,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dobutokO-frequency"; - version = "0.1.1.0"; - sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm"; + version = "0.1.2.0"; + sha256 = "165j0v7388jrjg1j3i7kl1vs7sb6r0s8c98i2kszqlw2ph4iq3vc"; libraryHaskellDepends = [ base ]; description = "Helps to create experimental music. Working with frequencies and types."; license = lib.licenses.mit; @@ -83407,6 +83771,8 @@ self: { pname = "doclayout"; version = "0.4"; sha256 = "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx"; + revision = "1"; + editedCabalFile = "0djwb7nrdablc0iy1qakrxpd4m7nn0w94vhb78il3jhjbj2ji179"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers emojis mtl safe text ]; testHaskellDepends = [ @@ -83514,6 +83880,8 @@ self: { pname = "doctemplates"; version = "0.10.0.2"; sha256 = "0as0sc4x4ch5z233dqlb8xqg97xbfbzw2dqsz9rfq8rw10v9yx57"; + revision = "1"; + editedCabalFile = "17r6ig72bzqd59p11sjaf9y27pm4yig1a1s1igs57s88cy47qz05"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe @@ -83738,6 +84106,35 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_2_5" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths + , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty + , process, QuickCheck, random, setenv, silently, stringbuilder, syb + , template-haskell, transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.2.5"; + sha256 = "075y4yllpgfq0dlfd6y9nqhsdkxzb9s3jgb0v194l216kg5zsqzc"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions extra filepath ghc ghc-paths Glob pretty process random + syb template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit + mockery process QuickCheck setenv silently stringbuilder syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -85562,6 +85959,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "dual-tree_0_2_3_1" = callPackage + ({ mkDerivation, base, monoid-extras, QuickCheck, semigroups + , testing-feat + }: + mkDerivation { + pname = "dual-tree"; + version = "0.2.3.1"; + sha256 = "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh"; + libraryHaskellDepends = [ base monoid-extras semigroups ]; + testHaskellDepends = [ + base monoid-extras QuickCheck semigroups testing-feat + ]; + description = "Rose trees with cached and accumulating monoidal annotations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dualizer" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers, lens , template-haskell, transformers @@ -87502,8 +87916,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "1.2.0.0"; - sha256 = "02ynz63c30vssq9lfcn619ll44q5yhnc9w1axbnmsp63zw93swap"; + version = "2.0.0.0"; + sha256 = "1fhi7nfaxbazq01pgypf5mk6gd6k983jm3qbvwf6wi75xqx68rxy"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -87525,8 +87939,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "1.2.0.0"; - sha256 = "0brhwd0axkq383b67jyhhgasny353issx7hak7lirvwn6zwfnilr"; + version = "2.0.0.0"; + sha256 = "15jg59843h0llv6v6s66nhz8q48ch1y5jibpxq4ki3w91nqaz13i"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -87544,8 +87958,8 @@ self: { pname = "effectful-plugin"; version = "1.0.0.0"; sha256 = "11y9d1ylwhgrrwf0pcpjqix2vrwzbwr2rlma6rm0h8yqpkchbx81"; - revision = "2"; - editedCabalFile = "1dc2asmhiydfz21cgrvmqqx4nwr8k7s2fdgwhvq1qf3zn6k086bx"; + revision = "3"; + editedCabalFile = "127phsvh3pq96lram633hwawcy594n36gc5cxiwaagaksi240568"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -87562,8 +87976,8 @@ self: { pname = "effectful-th"; version = "1.0.0.0"; sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; - revision = "2"; - editedCabalFile = "0v56i1wdq06v5hk7wcq8zgg60i8rbq1dqc47wwjz1wia5l2plhrl"; + revision = "3"; + editedCabalFile = "1nqwvgdvqgh4dvkidyaga7jd95p3hn54hy5gwadsvyf9lll4vjck"; libraryHaskellDepends = [ base containers effectful exceptions template-haskell th-abstraction @@ -89303,23 +89717,33 @@ self: { }) {}; "ema" = callPackage - ({ mkDerivation, aeson, async, base, constraints-extras, containers - , data-default, dependent-sum, dependent-sum-template, directory - , filepath, filepattern, http-types, lvar, monad-logger - , monad-logger-extras, neat-interpolation, optparse-applicative - , relude, text, unliftio, url-slug, wai, wai-middleware-static + ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup + , constraints-extras, containers, data-default, dependent-sum + , dependent-sum-template, directory, file-embed, filepath + , filepattern, fsnotify, generic-optics, generics-sop, http-types + , lvar, monad-logger, monad-logger-extras, mtl, neat-interpolation + , optics-core, optparse-applicative, pandoc, pandoc-types + , raw-strings-qq, relude, sop-core, template-haskell, text, time + , unionmount, unliftio, url-slug, wai, wai-middleware-static , wai-websockets, warp, websockets }: mkDerivation { pname = "ema"; - version = "0.6.0.0"; - sha256 = "0xha83himdaj64pm09dpvl0lrjvs6alk6mxh73d7ah1dbfsm79h1"; + version = "0.8.0.0"; + sha256 = "03phqldw1dldmp4gp1wmlm8cyb5qkg1v62brvhwbc9cl1iasllk2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async base constraints-extras containers data-default - dependent-sum dependent-sum-template directory filepath filepattern - http-types lvar monad-logger monad-logger-extras neat-interpolation - optparse-applicative relude text unliftio url-slug wai - wai-middleware-static wai-websockets warp websockets + aeson async base blaze-html blaze-markup constraints-extras + containers data-default dependent-sum dependent-sum-template + directory file-embed filepath filepattern fsnotify generic-optics + generics-sop http-types lvar monad-logger monad-logger-extras mtl + neat-interpolation optics-core optparse-applicative pandoc + pandoc-types relude sop-core template-haskell text time unionmount + unliftio url-slug wai wai-middleware-static wai-websockets warp + websockets + ]; + testHaskellDepends = [ + base generics-sop raw-strings-qq template-haskell text url-slug ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; @@ -89980,6 +90404,8 @@ self: { pname = "entropy"; version = "0.4.1.7"; sha256 = "1vp99gqavv5hg09zs2v0p74cxn135z1bq7qhxbk47d36npz3s1m9"; + revision = "1"; + editedCabalFile = "1r2xhsw66885dld1jdlrzg781d5wk273f5czqx4s5q7ad2cxiyfs"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -91236,8 +91662,8 @@ self: { }: mkDerivation { pname = "ersatz"; - version = "0.4.11"; - sha256 = "0zaw5a4za77xa1h8msg5v9hk6m215ykl3c258kgk519yvrfavyi3"; + version = "0.4.12"; + sha256 = "0xdmp8yc22flb2p7bczb56k2z79kp4zs0y9x5430029whhz90bar"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91490,6 +91916,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, template-haskell, text, time + , transformers, unliftio, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.7.0"; + sha256 = "1dqd1ni4rv70yrb71cbldrak22dgxgns3qnfhsnwbwp5mia9h1v1"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged template-haskell text time + transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged template-haskell text + time transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "esqueleto-pgcrypto" = callPackage ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent , persistent-postgresql, QuickCheck, text, transformers, unliftio @@ -93322,18 +93777,15 @@ self: { "exiftool" = callPackage ({ mkDerivation, aeson, base, base64, bytestring, hashable, process - , scientific, string-conversions, temporary, text - , unordered-containers, vector + , scientific, temporary, text, unordered-containers, vector, witch }: mkDerivation { pname = "exiftool"; - version = "0.2.0.0"; - sha256 = "138d25fxqz3vg62mfgmva52flyzjxd8dxr0kc7ayfil1zk3bp4jg"; - revision = "2"; - editedCabalFile = "1f1qa9qlmi3i7iif6ddazgqpgds64fr467c0rs53060rcbyjr9gd"; + version = "0.2.0.1"; + sha256 = "1s59pbwih18izh1iy9y0i56ysh2246dkdv98nan72zp2br5wz7g3"; libraryHaskellDepends = [ - aeson base base64 bytestring hashable process scientific - string-conversions temporary text unordered-containers vector + aeson base base64 bytestring hashable process scientific temporary + text unordered-containers vector witch ]; description = "Haskell bindings to ExifTool"; license = lib.licenses.mit; @@ -95013,6 +95465,34 @@ self: { broken = true; }) {}; + "faktory_1_1_2_3" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base + , bytestring, connection, cryptonite, errors, hspec, markdown-unlit + , megaparsec, memory, mtl, network, random, safe-exceptions + , scanner, semigroups, text, time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.1.2.3"; + sha256 = "1mihcmz3wzw2f6vfwv7xkvzhiql1fbb5v2llpkx5y455z939xl37"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson aeson-qq async base hspec markdown-unlit mtl time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -96148,6 +96628,27 @@ self: { license = "GPL"; }) {}; + "fedora-composes" = callPackage + ({ mkDerivation, base, bytestring, extra, http-conduit + , http-directory, simple-cmd, simple-cmd-args, text, time + }: + mkDerivation { + pname = "fedora-composes"; + version = "0.1"; + sha256 = "0vnkl4ikkl15gnmhrap7r0dlk80s9y8a4gdgbf7ilk7j6plw51b5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring extra http-conduit http-directory simple-cmd-args + text time + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Query Fedora composes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fedora-composes"; + }) {}; + "fedora-dists" = callPackage ({ mkDerivation, aeson, base, bytestring, cached-json-file, pdc , text, time @@ -97581,6 +98082,8 @@ self: { pname = "filestore"; version = "0.6.5"; sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; + revision = "1"; + editedCabalFile = "1v9xqm0112knv6za05qf310ldndrc0h3xhajgwjaycbzkrknz4n7"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -97755,8 +98258,8 @@ self: { pname = "fin-int"; version = "0.2.0"; sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; - revision = "2"; - editedCabalFile = "0c95hcd7shv5jhx7dg0riq3hqikyb1xgzj2dd7442hw8hglqkcxs"; + revision = "3"; + editedCabalFile = "1lwdv6z1rk734y7ccb6igyxlwbaqriww9d4ra3l4n20bcasmwb6w"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint @@ -98071,8 +98574,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; - revision = "3"; - editedCabalFile = "0bp43mbapcx4a2vvqfqs146faimafjm9h8vqjipcl2wwcfz46cca"; + revision = "4"; + editedCabalFile = "0hpq9rf8ckvk7ffxrpl683n6g1dvlw05qhjj98hhyxzws0dggrd0"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -98101,6 +98604,20 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "finite-typelits_0_1_6_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "finite-typelits"; + version = "0.1.6.0"; + sha256 = "0f047dywlxiz3pl3rq6maym9wpwjwl4zjqfwlwnj0yiv7dmlaiih"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "A type inhabited by finitely many values, indexed by type-level naturals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "finito" = callPackage ({ mkDerivation, base, numeric-domains, propeller, split , transformers @@ -98228,8 +98745,8 @@ self: { pname = "first-class-families"; version = "0.8.0.1"; sha256 = "0wnsq69f2br9h9hnf8sx41pchwjag86hb41ivjl7wx81psyqy72a"; - revision = "1"; - editedCabalFile = "1n6hpfc65lwmiwdg2gwjngvy146sw43r6j9q06g4vv4p69ci5r4b"; + revision = "2"; + editedCabalFile = "0idiqb4ckwa7hya827gc2cbjh83wmz3cppnl124834pkla2h99np"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "First-class type families"; @@ -98443,8 +98960,8 @@ self: { }: mkDerivation { pname = "fix-whitespace"; - version = "0.0.8"; - sha256 = "1vjbh3jx67xdzxnpyh9k2c5qv5axw07wck5jmahg0kxrj1w2nhh6"; + version = "0.0.9"; + sha256 = "0mykmvyici46kzvvcq17z19y02ma49a2y5n1r20pjbvyz5rz9vbm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98878,8 +99395,8 @@ self: { pname = "flac"; version = "0.2.0"; sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; - revision = "2"; - editedCabalFile = "1b3cbhvvhbv1d0gkfwgn9j9jx9cjn3w606vbpfhak2cyjmw26q36"; + revision = "3"; + editedCabalFile = "1cjy3066klhcywx5yba7ky58wsibhhwiamjbimdv04qc8vmdfm45"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -101134,7 +101651,7 @@ self: { mainProgram = "fortran-src"; }) {}; - "fortran-src_0_10_1" = callPackage + "fortran-src_0_10_2" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, either, fgl, filepath, GenericPretty, happy , hspec, hspec-discover, mtl, pretty, QuickCheck, temporary, text @@ -101142,8 +101659,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.10.1"; - sha256 = "0fd63lxwqy2y4axadbm7275w9pig0gf9imp60cpw3206qighwf6s"; + version = "0.10.2"; + sha256 = "13xpfwvfma4lrq7x4c7sb6xb17pxym03p790lprrirxdld6mdx9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101336,6 +101853,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "foundation_0_0_29" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.29"; + sha256 = "1hbkh6a3g6wsj2z48pjimd7djkm82mdxfwc24bnmmzag8amrp0rl"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -101425,7 +101956,7 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_8_0_0" = callPackage + "fourmolu_0_8_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -101435,8 +101966,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.8.0.0"; - sha256 = "0s89pbmmij2gd2wr0l4alg9rnxdsz9jp4brxi9rkkin6bqjqmix1"; + version = "0.8.1.0"; + sha256 = "0acpl5p259pfs42k4iaqhpfpbpbzjk8fxzc65i9wr2wka9cdvzdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104171,8 +104702,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.15"; - sha256 = "02a3hhbbix1kk3dd6l0nq70b04415q2xjnbb2vfphayq8sj5v5b4"; + version = "0.22.1"; + sha256 = "1h3ihd0cymcnbv5ms49dmfpgyngmai58v61sw5j04zi7f9xjyr0n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105846,6 +106377,25 @@ self: { license = lib.licenses.mit; }) {}; + "generic-arbitrary_1_0_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "generic-arbitrary"; + version = "1.0.0"; + sha256 = "1l1d61336r92rrpcgsdfxfc2c9slvf9g1m7vbl54bcvw0qlgzgc9"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base deepseq QuickCheck tasty tasty-discover tasty-hunit + tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -105898,6 +106448,8 @@ self: { pname = "generic-data"; version = "0.9.2.1"; sha256 = "0hs5ahl1nx61kw5j0pnwgjrph7jgqq0djma956ksz6aivzldjf7q"; + revision = "1"; + editedCabalFile = "01ly8r9s34pj8i7ppjclclx3fmnv24lhic1n7cjz5cdk3cxa8klc"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -105911,6 +106463,28 @@ self: { license = lib.licenses.mit; }) {}; + "generic-data_1_0_0_0" = callPackage + ({ mkDerivation, ap-normalize, base, base-orphans, contravariant + , criterion, deepseq, generic-lens, ghc-boot-th, one-liner + , show-combinators, tasty, tasty-hunit + }: + mkDerivation { + pname = "generic-data"; + version = "1.0.0.0"; + sha256 = "1cfax93wzb9w3lfhrp4lmyyqxj6cjvsjny8wv3qxjyfqs2w2380g"; + libraryHaskellDepends = [ + ap-normalize base base-orphans contravariant ghc-boot-th + show-combinators + ]; + testHaskellDepends = [ + base generic-lens one-liner show-combinators tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Deriving instances with GHC.Generics and related utilities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-data-surgery" = callPackage ({ mkDerivation, base, first-class-families, generic-data , show-combinators, tasty, tasty-hunit @@ -106001,8 +106575,8 @@ self: { pname = "generic-functor"; version = "0.2.0.0"; sha256 = "0zrjsn78ip9kigqgw5cxzm9d7pqf1svdzrc3rm041889ca0szwjv"; - revision = "2"; - editedCabalFile = "0wmrfikbdc65lxa9x7gnmf2j0njiqgnpp5p5i8pjc009rqna1hzv"; + revision = "3"; + editedCabalFile = "1b14y3qhwzp2gkby5zflwad1v8v26wnclb7wnjagy67pvhnnn93d"; libraryHaskellDepends = [ ap-normalize base ]; testHaskellDepends = [ base transformers ]; description = "Deriving generalized functors with GHC.Generics"; @@ -107640,8 +108214,8 @@ self: { }: mkDerivation { pname = "gerrit"; - version = "0.1.5.0"; - sha256 = "0cxl0shwjz81c4inqqan6akxnwxx8i0yalwxd7xbizn55268rmcg"; + version = "0.1.5.1"; + sha256 = "1bj34cp9myz4rrbbwbh73b8wbmrgck81nsx88mi984pww1nd5fnb"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-openssl text time @@ -107716,6 +108290,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "gettext-th" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , haskell-gettext, template-haskell, text, th-lift-instances + }: + mkDerivation { + pname = "gettext-th"; + version = "0.1.0.3"; + sha256 = "0z0mz8bm4a1ns2k7mm5k1amm0l9vk7f64g3w6la7v7q80zaql0b1"; + libraryHaskellDepends = [ + base bytestring directory filepath haskell-gettext template-haskell + text th-lift-instances + ]; + description = "gettext-th can internationalise a haskell program without runtime dependencies"; + license = lib.licenses.bsd3; + }) {}; + "gf" = callPackage ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi , containers, directory, exceptions, filepath, ghc-prim, happy @@ -107927,8 +108517,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; - revision = "2"; - editedCabalFile = "0lh3giqq47wf02glc96wsn6qxnll7d6x6xa78fzs32xjww6p4ig3"; + revision = "3"; + editedCabalFile = "088rz5c0pq2r1w3msy0y9hl4gca8s8nblpcz7w2f5sx5pajg8flj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -107954,8 +108544,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.5.0.6"; - sha256 = "14cdfbjk8l3j97v46clpb806zlkckbfhgpzip67byhw9kzv5r14s"; + version = "0.5.0.8"; + sha256 = "1m3w1l8gkc7g9p7d07h3f71687rgs9lb5ildgfr1ihxp7wssh98h"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-paths process safe-exceptions template-haskell th-compat transformers @@ -108616,6 +109206,8 @@ self: { pname = "ghc-lib"; version = "9.4.1.20220807"; sha256 = "0anaf36bgziqy8ajc5442qf06xv06p3x46dca29qdnplckjypc51"; + revision = "1"; + editedCabalFile = "00mik89sdk4hr5pk3f82kdyik0aamlc1c6apiwvqv03pwrl2v6ih"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -109283,13 +109875,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_8_0" = callPackage + "ghc-syntax-highlighter_0_0_9_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.8.0"; - sha256 = "1s6bq90s75qfiv54qsskawv3ihwjhdml4fxq56ww01p54mnrwr27"; + version = "0.0.9.0"; + sha256 = "0dan000fg9ipfh8knhrdscnr8lvcf6p2djl9b4bgqd4nc65pcf8a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -109433,8 +110025,8 @@ self: { ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.2.5"; - sha256 = "1whhadv077c0kgz4c3jwrynjkamgkc4rinf0pd18m3d3bdk27w0k"; + version = "0.1.2.6"; + sha256 = "1yc4ryjmg72znml92wlllxzgvh7z48id6jdyxcfq8fbal5wx6pc3"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; @@ -113973,6 +114565,34 @@ self: { broken = true; }) {}; + "gltf-loader" = callPackage + ({ mkDerivation, base, base64, binary, bytestring, gltf-codec + , hspec, linear, microlens, optparse-simple, rio + , unordered-containers + }: + mkDerivation { + pname = "gltf-loader"; + version = "0.1.0.0"; + sha256 = "01kxmkk6vvgjvm2jafrwq5ldyylk19j1f4rd145ilyk7j1rx8651"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring gltf-codec linear microlens rio + unordered-containers + ]; + executableHaskellDepends = [ + base linear microlens optparse-simple rio + ]; + testHaskellDepends = [ + base base64 binary bytestring gltf-codec hspec linear microlens rio + unordered-containers + ]; + description = "High level GlTF loader"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "gltf-loader-exe"; + }) {}; + "glue" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec , lifted-base, monad-control, monad-loops, QuickCheck @@ -118708,6 +119328,31 @@ self: { license = lib.licenses.mit; }) {}; + "graphula_2_0_2_1" = callPackage + ({ mkDerivation, base, containers, directory, generic-arbitrary + , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl + , persistent, persistent-sqlite, QuickCheck, random, resourcet + , semigroups, temporary, text, transformers, unliftio + , unliftio-core + }: + mkDerivation { + pname = "graphula"; + version = "2.0.2.1"; + sha256 = "0kkjhfb9x3s0j6m0a68cblfkh70wg2vxrd1f998g20dlpx5rl27m"; + libraryHaskellDepends = [ + base containers directory generics-eot HUnit mtl persistent + QuickCheck random semigroups temporary text unliftio unliftio-core + ]; + testHaskellDepends = [ + base generic-arbitrary hspec markdown-unlit monad-logger persistent + persistent-sqlite QuickCheck resourcet transformers unliftio-core + ]; + testToolDepends = [ markdown-unlit ]; + description = "A simple interface for generating persistent data and linking its dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "graphula-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit @@ -119218,8 +119863,8 @@ self: { }: mkDerivation { pname = "gridtables"; - version = "0.0.2.0"; - sha256 = "0bqn1iqpiam9szjwdwam76vh991miyfznyk7gnnr4vrk8jn17p3d"; + version = "0.0.3.0"; + sha256 = "1akix9flnax6dx3s9c7yyzb19nw13y8rmh0kz7y3hpjlkaz659xy"; libraryHaskellDepends = [ array base containers doclayout parsec text ]; @@ -121905,22 +122550,20 @@ self: { }) {}; "hackage-repo-tool" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , hackage-security, microlens, network, network-uri, old-time - , optparse-applicative, tar, time, unix, zlib + ({ mkDerivation, base, bytestring, Cabal, Cabal-syntax, directory + , filepath, hackage-security, microlens, network, network-uri + , old-time, optparse-applicative, tar, time, unix, zlib }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1.2"; - sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r"; - revision = "2"; - editedCabalFile = "1djx6x1y6d7j319ba211hl7scwh4pfyd7vrrbvhdralwnwsx5zkp"; + version = "0.1.1.3"; + sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal directory filepath hackage-security microlens - network network-uri old-time optparse-applicative tar time unix - zlib + base bytestring Cabal Cabal-syntax directory filepath + hackage-security microlens network network-uri old-time + optparse-applicative tar time unix zlib ]; description = "Manage secure file-based package repositories"; license = lib.licenses.bsd3; @@ -121939,10 +122582,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.2.1"; - sha256 = "1a349ma9ijypjzgj7xgkkr6rd8k49crdgx330h9vgmp7vlbcs8mz"; - revision = "2"; - editedCabalFile = "1r7jaf7vq90xlcsdq9snlz3d52zqcpijlby7abpzfw09v4mjjjqx"; + version = "0.6.2.2"; + sha256 = "0xmjw3frssdv3glhdg3yivdy38h5icz6xywngrahc19220ba6cx8"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -121950,9 +122591,9 @@ self: { template-haskell time transformers zlib ]; testHaskellDepends = [ - aeson base bytestring Cabal containers network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary text time - unordered-containers vector zlib + aeson base bytestring Cabal Cabal-syntax containers network-uri + QuickCheck tar tasty tasty-hunit tasty-quickcheck temporary text + time unordered-containers vector zlib ]; description = "Hackage security library"; license = lib.licenses.bsd3; @@ -122264,8 +122905,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.25.1"; - sha256 = "1icwwpppi8djqjrfqcys6q8zxlpf14dna6j71qzzv4r9zdz5kr7r"; + version = "2.27.0"; + sha256 = "094207chb9vw7nnz5bznnifzyk9waxwylv0r7n1nyahbjs013lyn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -122306,14 +122947,14 @@ self: { "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, hspec-discover, mtl, parsec, QuickCheck - , transformers, xhtml + , directory, exceptions, filepath, ghc, ghc-boot, ghc-boot-th + , ghc-paths, haddock-library, hspec, hspec-discover, mtl, parsec + , QuickCheck, transformers, xhtml }: mkDerivation { pname = "haddock-api"; - version = "2.25.1"; - sha256 = "1zcgpzhnavkgf8pk4wr15rmcm4y6fz3jr03zg5gw9347hkxn0ry7"; + version = "2.27.0"; + sha256 = "198j5cn6zasb44w3yb8dqhsx6bv2xndh6xfc8ypjfg491qs8819z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory exceptions @@ -122322,8 +122963,8 @@ self: { ]; testHaskellDepends = [ array base bytestring containers deepseq directory exceptions - filepath ghc ghc-boot ghc-paths haddock-library hspec mtl parsec - QuickCheck transformers xhtml + filepath ghc ghc-boot ghc-boot-th ghc-paths haddock-library hspec + mtl parsec QuickCheck transformers xhtml ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; @@ -122411,6 +123052,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "haddock-library_1_11_0" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, directory + , filepath, hspec, hspec-discover, optparse-applicative, parsec + , QuickCheck, text, tree-diff + }: + mkDerivation { + pname = "haddock-library"; + version = "1.11.0"; + sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; + libraryHaskellDepends = [ base containers parsec text ]; + testHaskellDepends = [ + base base-compat containers deepseq directory filepath hspec + optparse-applicative parsec QuickCheck text tree-diff + ]; + testToolDepends = [ hspec-discover ]; + description = "Library exposing some functionality of Haddock"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "haddock-test" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , process, syb, xhtml, xml @@ -122994,8 +123655,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "4"; - editedCabalFile = "0bvyn8mw6gy95liznjad0gjbj7130dsb0va40xmmfdy97dcp5jql"; + revision = "6"; + editedCabalFile = "0vkss84dm4fgx94r2wrv1z5mk515am6vbd2y66v44vl7fcr23q83"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125810,7 +126471,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_4_0_2" = callPackage + "hashable_1_4_1_0" = callPackage ({ mkDerivation, base, base-orphans, bytestring, containers , deepseq, ghc-bignum, ghc-prim, HUnit, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -125818,8 +126479,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.4.0.2"; - sha256 = "003nlhi8wzlsikfwi0q6ma3b38wizvazci6dbq3lr4bd6pfnwq43"; + version = "1.4.1.0"; + sha256 = "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1"; libraryHaskellDepends = [ base base-orphans bytestring containers deepseq ghc-bignum ghc-prim text @@ -129023,8 +129684,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.3.2"; - sha256 = "1rrzgzgajga1gvw6cfmlif1crzy7zr0dq7wyx1r6rp7sf0drrgxr"; + version = "0.3.2.1"; + sha256 = "1kfdr56by97lzccp1zvp21za683jn95cnmsmzz87nyxm1gz0wyk4"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell text ]; @@ -132375,10 +133036,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hcom"; - version = "0.0.0.4"; - sha256 = "1xvl0p58q8l7yq90hfydgy2h5644xxjai99frli719l2mg7s1ndm"; - revision = "3"; - editedCabalFile = "0dzyhd2gjpv7182s1pjvwxwnxa19pva1x94837my57hmnrs7iskh"; + version = "0.0.0.5"; + sha256 = "02f959qd7gm5gpa8w39hqj5a8pn6gizjif7rr7mwlq8g3gsq8gsk"; doHaddock = false; description = "Haskell COM support library"; license = lib.licenses.bsd3; @@ -136492,10 +137151,8 @@ self: { }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.2.0"; - sha256 = "1jm3gbibafkw3ninvsz7f1x89xdyk6wml45mq9zb85p6m9xqlpv9"; - revision = "1"; - editedCabalFile = "1q53g0h4xnq0fsjbwg1fclnw0kxpzz58p8jrczhmgb4z5wn8g292"; + version = "0.1.3.0"; + sha256 = "04rrdyga6abml3d3bn1amd955g9k0jj4pczh659bimw8hwccp2pw"; libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; testHaskellDepends = [ base binary bytestring hspec mtl rio vector @@ -139117,6 +139774,8 @@ self: { pname = "hledger-ui"; version = "1.26.1"; sha256 = "0gbysjc8vknlsd0rl60iz3da2zpyhwvq5gj9bpl2h4r0hf1ymplb"; + revision = "1"; + editedCabalFile = "1pni118r8b1fy9mwr5058rn416rxyab11l7dx4ib7g4snzck1iw5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143462,21 +144121,24 @@ self: { "hpdft" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, file-embed, memory, optparse-applicative, parsec - , semigroups, text, utf8-string, zlib + , regex-base, regex-compat-tdfa, semigroups, text, utf8-string + , zlib }: mkDerivation { pname = "hpdft"; - version = "0.1.0.6"; - sha256 = "04r5a9z36dglpfz7j01cz3yizi9l0633rf630ypg2sfxkhn2384w"; + version = "0.1.1.1"; + sha256 = "1klpm1p19pixi051a7ld5hp6qbwvcbbiwy6zgf39n5zx3hi9yxx0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers directory file-embed - memory optparse-applicative parsec semigroups text utf8-string zlib + memory optparse-applicative parsec regex-compat-tdfa semigroups + text utf8-string zlib ]; executableHaskellDepends = [ - base bytestring memory optparse-applicative semigroups utf8-string + base bytestring memory optparse-applicative regex-base + regex-compat-tdfa semigroups text utf8-string ]; description = "A tool for looking through PDF file using Haskell"; license = lib.licenses.mit; @@ -145812,6 +146474,8 @@ self: { pname = "hsc2hs"; version = "0.68.8"; sha256 = "0lksyyfrvn3km8bmfjad0mr50mg20f9fwfqly83lma0pr7xiwd3q"; + revision = "1"; + editedCabalFile = "0s9s46zmm4g4hlwspi4jimggka87xki68lfg555g94sjnbwjk34q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -147192,8 +147856,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "5"; - editedCabalFile = "1qd2z4rn478mwqcslzdk71izjmmhn1kw115fy7iryaf3kdc1j0g4"; + revision = "6"; + editedCabalFile = "0xiqjl646kxynsccc2q1q91sch7pfx3274yl2745fsqhpb115df1"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -147555,6 +148219,26 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-path_1_0_3" = callPackage + ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling + , hslua-packaging, tasty, tasty-hunit, tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-path"; + version = "1.0.3"; + sha256 = "1sy2k4mb263kg85vkf39ja84xz5kvm6z61xn62jy1swhrvvd96sr"; + libraryHaskellDepends = [ + base filepath hslua-core hslua-marshalling hslua-packaging text + ]; + testHaskellDepends = [ + base filepath hslua-core hslua-marshalling hslua-packaging tasty + tasty-hunit tasty-lua text + ]; + description = "Lua module to work with file paths"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, directory, exceptions, hslua-core , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua @@ -149014,25 +149698,13 @@ self: { ({ mkDerivation, base, hspec, tmp-proc }: mkDerivation { pname = "hspec-tmp-proc"; - version = "0.5.0.1"; - sha256 = "0zn0q3cvszpnb0lqlnizfh8v0z2kasjl414ny4pzni6yf13m2jfh"; + version = "0.5.1.2"; + sha256 = "0d3igvda8a0lhqzvvzrf1ck8nmif4w447gkjyq6g87am883a078v"; libraryHaskellDepends = [ base hspec tmp-proc ]; description = "Simplify use of tmp-proc from hspec tests"; license = lib.licenses.bsd3; }) {}; - "hspec-tmp-proc_0_5_1_1" = callPackage - ({ mkDerivation, base, hspec, tmp-proc }: - mkDerivation { - pname = "hspec-tmp-proc"; - version = "0.5.1.1"; - sha256 = "1wd3pz9q7p8z7917qblzldzchvdfwp625bbysxbdi41186wfd0dh"; - libraryHaskellDepends = [ base hspec tmp-proc ]; - description = "Simplify use of tmp-proc from hspec tests"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "hspec-wai" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck @@ -150095,8 +150767,8 @@ self: { }: mkDerivation { pname = "htalkat"; - version = "0.1.2.1"; - sha256 = "0n58c32k661jw0srgfwssx0lwb3myyijbxksa8qpq174whfmmfl1"; + version = "0.1.2.2"; + sha256 = "08w501lyhhr5d7w6s9zvhrwk8sm3kkr5v6l2h6ghazqcvlrl63v2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150354,8 +151026,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; - revision = "4"; - editedCabalFile = "0xi765ynj5jq3qmchd6zzpfhgq6d1436dyd154866g8nwklp50ch"; + revision = "5"; + editedCabalFile = "1776z73bs1v8z3qwpjvqqmzdlj6gm8qba93f41irhn7swdppfq72"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -151142,18 +151814,18 @@ self: { }) {}; "http-client-websockets" = callPackage - ({ mkDerivation, base, bytestring, hspec, http-client - , http-client-tls, network-uri, text, websockets + ({ mkDerivation, async, base, bytestring, hspec, http-client + , network-uri, text, websockets }: mkDerivation { pname = "http-client-websockets"; - version = "0.1.1.2"; - sha256 = "0g2zhj0fzhynyls5rxpzh50hxjsygx7037rw2h79ihca10crsqgm"; + version = "0.1.1.3"; + sha256 = "1g9bmvh4p0z58iyk652nall031fsypg2dbc9x57x7ngj2wd2m15f"; libraryHaskellDepends = [ base bytestring http-client network-uri text websockets ]; testHaskellDepends = [ - base bytestring hspec http-client-tls network-uri websockets + async base bytestring hspec http-client network-uri websockets ]; description = "Glue code for http-client and websockets"; license = lib.licenses.cc0; @@ -151400,6 +152072,8 @@ self: { pname = "http-io-streams"; version = "0.1.6.1"; sha256 = "09ggsf9g8gf28d3d5z0rcdnl63d34al35z5d6v68k0n7r229ffb1"; + revision = "1"; + editedCabalFile = "0v2xp9fhrw77vh4vz5qk9lip5mhbf9lz5nkdrfcvrilfjgg4s17b"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -152939,16 +153613,19 @@ self: { }) {}; "hw-aeson" = callPackage - ({ mkDerivation, aeson, base, containers, doctest, doctest-discover - , hedgehog, hspec, hspec-discover, text, text-short - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hedgehog, hspec, hspec-discover, text + , text-short, unordered-containers }: mkDerivation { pname = "hw-aeson"; - version = "0.1.6.0"; - sha256 = "06xi9bj0jsp2g2d2wkxs6w2p96i927alrrm4r9vpm530cd1zxzwr"; + version = "0.1.8.0"; + sha256 = "1x07dpgqhlcvgn1kwq0mmf074x91sl7sn2gxrqrznjdzl8hqw2m2"; + revision = "1"; + editedCabalFile = "0ddfw858v0zk4i19w00kinjdq4y5jbnmq1i3m6yvr5nnmf09n0dw"; libraryHaskellDepends = [ - aeson base containers text text-short unordered-containers + aeson base bytestring containers hashable text text-short + unordered-containers ]; testHaskellDepends = [ aeson base doctest doctest-discover hedgehog hspec @@ -153014,6 +153691,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.2"; sha256 = "163jvw8nnhf3q3h6c16hjdkdzp6y3l2hyvk7hzynhylifg7kki95"; + revision = "1"; + editedCabalFile = "14j39s62mh8asgjysd48sh4wglyxkrmfwxni0ibxgnwgzrdi6j8p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153049,6 +153728,8 @@ self: { pname = "hw-bits"; version = "0.7.2.2"; sha256 = "1swzr6lz2394p454mqvvgx2fyc1gdm4p9qvv54zyjd67mnhylkq8"; + revision = "1"; + editedCabalFile = "09cwkvwpxdhwd2zf0ad9kn02vndypl203j0d8zjsi6088fy18y7g"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -153097,6 +153778,8 @@ self: { pname = "hw-conduit"; version = "0.2.1.1"; sha256 = "1iv001vm0xlz9msw5f6bcr2a4fd7rhyd1zmk3axnh80g4m8lknzj"; + revision = "1"; + editedCabalFile = "04vgiy5i3qwxspdxwb4nyw0snzqvsiqilwibb8zjv0nd51d9kpwk"; libraryHaskellDepends = [ array base bytestring conduit conduit-combinators time transformers unliftio-core word8 @@ -153120,6 +153803,8 @@ self: { pname = "hw-conduit-merges"; version = "0.2.1.0"; sha256 = "042i1cs7qpjs8q8birr6xjzyxp28y7l6isv2fwkisv4agx8kfgm0"; + revision = "1"; + editedCabalFile = "0r9vq3ibdbkwxg26ds9dllhkgpbhlrv0i02babjpmd3g1nznp0ms"; libraryHaskellDepends = [ base conduit conduit-extra mtl ]; testHaskellDepends = [ base bytestring conduit conduit-extra hspec mtl QuickCheck @@ -153156,6 +153841,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.1"; sha256 = "0xfpkyinwfhjilb428z7nnk84m12b34x29806j1azbv9yfqvhq7z"; + revision = "1"; + editedCabalFile = "1cs73d2pycaf5h7ggw00j9pnbx9b5hyz4ry885c4awa4ag2d5waa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153230,6 +153917,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.1"; sha256 = "1k22yq8blyjmgh7nzmqvnc1g0bgjbbvqv9r4w02z5jn9kfj619h2"; + revision = "1"; + editedCabalFile = "0kqjihb11l141qsdpwx8vil2blpg9xz2nypmlhljfvszf4myg9b5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153266,8 +153955,8 @@ self: { pname = "hw-excess"; version = "0.2.3.0"; sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g"; - revision = "3"; - editedCabalFile = "0gzvcpihgv1xmnyl1ry4kdzvrm80449viv3l0rvzmj16gzx7lhg2"; + revision = "4"; + editedCabalFile = "0239zkl95ri5prg6w7zicb393pmb9gbh9lsymw9k3lv4340r9c98"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -153291,6 +153980,8 @@ self: { pname = "hw-fingertree"; version = "0.1.2.1"; sha256 = "0aljn5c2gblvrbn1f7iwvcm2fa2dsnl497wb0g8y7rz6jzk7g06f"; + revision = "1"; + editedCabalFile = "10wskprjxp65znb3fyzbrjgh9fqxndmlnvqc6kf50v7qif8jrvb6"; libraryHaskellDepends = [ base deepseq hw-prim ]; testHaskellDepends = [ base deepseq doctest doctest-discover hedgehog hspec @@ -153310,6 +154001,8 @@ self: { pname = "hw-fingertree-strict"; version = "0.1.2.1"; sha256 = "1y9h4riikfdrxbmfchm95qv2pmwsshdl27ngimkd5iww3d67vg36"; + revision = "1"; + editedCabalFile = "0qi67ja0s9mac65bgmrba4hixjf8n00qnqmna589dfgginkmcsng"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base doctest doctest-discover hedgehog hspec HUnit @@ -153328,6 +154021,8 @@ self: { pname = "hw-hedgehog"; version = "0.1.1.1"; sha256 = "0kksignrvx566vfz52q5lid9f2zh02dpvnw1gznnkhwnvbldmbi8"; + revision = "1"; + editedCabalFile = "1h2z4s3jm4aq6gnhf5hg81pyr0xargz02krrfih4p3rgfxi5r9yg"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base doctest doctest-discover ]; testToolDepends = [ doctest-discover ]; @@ -153343,6 +154038,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.1"; sha256 = "1ilgqrx8jvgvmns99d74qz8c11ifyrccbvszfzwwhk28fhai0k7s"; + revision = "2"; + editedCabalFile = "0r10fgpl0k84ghni6wg5qddnwkmcqg9gx2s1hv064lq7djj979sn"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -153418,6 +154115,8 @@ self: { pname = "hw-json"; version = "1.3.2.3"; sha256 = "1m5q46ywmdymk2xwqbpm0rswmkbdfzscg6gdym61yninz2sjmd7a"; + revision = "1"; + editedCabalFile = "1xr86w12f31djqk4f80y2kqa2lwymfsk38zicadgy0qs8bdgmkgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153507,6 +154206,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.1"; sha256 = "0nn6fyvw0j2csn8anqpgjzdzdasiwa99g1v2qrcyym1wi86biqqb"; + revision = "1"; + editedCabalFile = "0cavymml55m8f1zyh8pby44xq67ckdqdy0wgib8i0xjq00hrp07m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -153535,6 +154236,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.1"; sha256 = "0b867rgsybfb568z6qa4x8jqz24wfjydg91w7bsl44vqq0k3hk4f"; + revision = "1"; + editedCabalFile = "0f9ml3rgbwcrxyfr0kq2y0vk92j4nrl88r5aq7cdzbd63j2c8yp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153572,6 +154275,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.2"; sha256 = "02fmhjnjf0idmzq0y1a1m78bwl72ycvr6cxlscxpc2370r2s3akh"; + revision = "1"; + editedCabalFile = "1w4jp3jf4p08mkn3x1zfpw5hrsr8l16n01qcvvlzj8jpbkqpq2jm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153746,6 +154451,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.1"; sha256 = "0aplyknpf81kqpisz9zibyncg2i95dnfv6kywlg3wf7ic1wcjqxh"; + revision = "1"; + editedCabalFile = "0r125gn3qq9lpxymri62w9mibgp40jwcskjyqkii370yxda9xwxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153777,8 +154484,8 @@ self: { pname = "hw-parser"; version = "0.1.1.0"; sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; - revision = "4"; - editedCabalFile = "0wiizlmhv1pjc9fpga5fjfxzxcf55qgamg6gl1n4c9x5l5yj6yk6"; + revision = "5"; + editedCabalFile = "16q34ps40chq2cvcr74f4mzkp64fmkrniiwpzwnfmx128arg35fk"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; @@ -153817,6 +154524,8 @@ self: { pname = "hw-prim"; version = "0.6.3.1"; sha256 = "1b3qk0w8jivbhpkxkp4b1spj1nvfjjf2k6a0ba9agjp9kjmwddni"; + revision = "2"; + editedCabalFile = "01gc1zz7q37kk27imb2inplkgimrrh51yh7f4dj89wlzxs9p0k6d"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -153871,6 +154580,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.1"; sha256 = "03nf8jwr1qpbfa20y3zlb3z6cxy8ylpdbsy0fvxdjs8q35f7bmx5"; + revision = "1"; + editedCabalFile = "10kij3ygsrq7qkbdmarggi2iiaprf670ss9ci4d3vsdgj043sqdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153907,8 +154618,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.4.1"; sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; - revision = "3"; - editedCabalFile = "0xb03a8bla45rbdnfjaq9pbz2r0mz9b3vm2ljm6lmr1dpgy0yh5c"; + revision = "4"; + editedCabalFile = "1yiwc9l81bcg5a8i2r08lv8nqms2b69a7vnwcxzms7mkd01s9sgp"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -153936,6 +154647,8 @@ self: { pname = "hw-simd"; version = "0.1.2.1"; sha256 = "051dbwi4kvv04dnglcx9666g097fy9rw8kmgbcw5y9cs06mbw9cr"; + revision = "1"; + editedCabalFile = "0vlb7g2d7banqqkpb2lij70357fwc2i5nkvp4ydh649kgj4zd9lq"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base transformers vector @@ -153998,8 +154711,8 @@ self: { pname = "hw-streams"; version = "0.0.1.0"; sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; - revision = "3"; - editedCabalFile = "0g2fhjv62jf807j2w5rikfbmsircpjf6q0l8xqpbyy8krch8mrx5"; + revision = "4"; + editedCabalFile = "0j0xb27gfajhxys60c4f5w5skpzzgpq6jvhaa28wlqnjpgxfw05h"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector @@ -154026,6 +154739,8 @@ self: { pname = "hw-string-parse"; version = "0.0.0.5"; sha256 = "0sg5s84pqyl93wm052ifrqv90cyc28awh4i6vcd8zbq746wdqz4k"; + revision = "1"; + editedCabalFile = "0afarlf42yfsgbv4lwhl7hnrsxv6b5dilja1660fnxvw350ldiik"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring doctest doctest-discover hspec QuickCheck vector @@ -154086,8 +154801,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; - revision = "5"; - editedCabalFile = "07mir09f9h35f3cajsi68nnmk45fah1730wxi2kbmb8ya28ny0kj"; + revision = "6"; + editedCabalFile = "05160yfydz3hx8xigl6kvy7862gwadksqwsayr68fa40br5di8f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154138,6 +154853,8 @@ self: { pname = "hw-xml"; version = "0.5.1.1"; sha256 = "1gjs2rcm40j3962kw7n02pqim1p485prm1bd2v8hk1ka35c8nq1w"; + revision = "1"; + editedCabalFile = "1q5h0bz9nl21qi93c5bmm0vc5dvyxzcrp3mv9jr2wa6rzah07gdq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156059,8 +156776,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "4"; - editedCabalFile = "1mlmn7ccns2rnhgmnlq9m2rqc9mgj0262ckqbm01w1fiycw3nq7b"; + revision = "5"; + editedCabalFile = "0aswi9gwa4f1ll5s323qc6g9fm2h9dc8j526izcbflagxicf04a8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -158149,24 +158866,22 @@ self: { pname = "indexed-traversable"; version = "0.1.2"; sha256 = "13b91rkhs6wcshaz3dwx6x3xjpw5z5bm2riwp78zxccqf7p5hs2i"; - revision = "1"; - editedCabalFile = "0rbcfl0iklix3ppfkxh88y70qmm64lg1l4679z5krya2fa42hqnn"; + revision = "2"; + editedCabalFile = "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; }) {}; "indexed-traversable-instances" = callPackage - ({ mkDerivation, base, containers, criterion, indexed-traversable - , OneTuple, QuickCheck, quickcheck-instances, tagged, tasty - , tasty-quickcheck, transformers, unordered-containers, vector + ({ mkDerivation, base, containers, indexed-traversable, OneTuple + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers, unordered-containers, vector }: mkDerivation { pname = "indexed-traversable-instances"; - version = "0.1.1"; - sha256 = "0i4s8fbqbgvkd2na48zwhlrcjpwxkx5rdh6f9fq2h4sl7c1d23hh"; - revision = "1"; - editedCabalFile = "1655cf712kkjrpf0axwgdf7y6yjqnf2njyijlfr3mdzzy6dkagwb"; + version = "0.1.1.1"; + sha256 = "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -158176,10 +158891,6 @@ self: { quickcheck-instances tasty tasty-quickcheck transformers unordered-containers vector ]; - benchmarkHaskellDepends = [ - base containers criterion indexed-traversable unordered-containers - vector - ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; }) {}; @@ -159319,8 +160030,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "2"; - editedCabalFile = "1nciavqjkv0yqh7xy20666srm92ip520bnhnhwkwaaabdzn12pmn"; + revision = "3"; + editedCabalFile = "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -159898,8 +160609,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "2.1.0"; - sha256 = "094yr4vkki9ah9f627ds8bj1q8ql9mhgd49dkf9bydf9g7l5fhaj"; + version = "2.1.1"; + sha256 = "0z5nzz3piyjvl4syz10scnj5p698rnm28i97y69kpc10kri62ihm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160221,8 +160932,8 @@ self: { pname = "invert"; version = "1.0.0.2"; sha256 = "13zl9i6g7ygkm3pgm7b72815cfp66mykxzp5vwy5kqakr8c3w1fp"; - revision = "1"; - editedCabalFile = "01qaybywd30b5s3clvw4bblq9pviwckgc2claf7lvl4fq6hjqszs"; + revision = "2"; + editedCabalFile = "1kc8nfwwy3vr6sc6pdw23lpyc1x91bp9rinmrkjp3zl94ck8y179"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector @@ -160257,6 +160968,8 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "invertible-grammar" = callPackage @@ -160302,6 +161015,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -160459,8 +161173,8 @@ self: { pname = "io-streams"; version = "1.5.2.1"; sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; - revision = "2"; - editedCabalFile = "16sr5jkw6k4k7bbfwp1p756lfjwqvx0ls5yrlvc056pg6h2js5m9"; + revision = "3"; + editedCabalFile = "14zy4y6xnrfal02w0m8smjpb202axmq88cm40722rzxfpy5s1cjq"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -160476,6 +161190,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "io-streams_1_5_2_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory + , filepath, HUnit, mtl, network, primitive, process, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, vector, zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.2.2"; + sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring network primitive process text time + transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring deepseq directory filepath HUnit mtl + network primitive process QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -160484,8 +161224,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "5"; - editedCabalFile = "073aciql0czvpaiwh9mpljcd1j2a8p5ka5awsw1j3dh7bdyg2mp7"; + revision = "6"; + editedCabalFile = "024aw98q1x3fb1xq07qki3z446w6lk5gyjl13shy0dbrd5aafh92"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -161677,8 +162417,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.5"; - sha256 = "03sarmva392szf5c04nqq795jsbkbklad409y8ym49kvb28mh1sg"; + version = "0.1.0.6"; + sha256 = "0sy9v5830giqkk4r7c0ycvm5z3racf953dy5lwsfxm7zygzb8dm3"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -162531,6 +163271,8 @@ self: { pname = "j"; version = "0.3.0.1"; sha256 = "1v4hp7skddbjw6d2ggyfspijmsxh346c97nxwh2anp05aykmzk7b"; + revision = "1"; + editedCabalFile = "08yfwfh6khy8nq4kcjr46zx0iikh43a5y24wg4znwsc7mxvqj2h4"; libraryHaskellDepends = [ base bytestring repa unix vector ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -162583,6 +163325,8 @@ self: { pname = "jacinda"; version = "1.1.0.0"; sha256 = "0sx15lslkcvck7cvd55ykkifba9cv0ig0h53ycf0izbl3cxdr1j9"; + revision = "1"; + editedCabalFile = "020zfmmiyinbcgrrl7jlkyjq7xajsk2qz4z9infr9vsjig0c61xj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167940,12 +168684,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ki_1_0_0" = callPackage + "ki_1_0_0_1" = callPackage ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.0"; - sha256 = "1nag3rc3yiwc3x9q0mn70vrb6vjh7f2vxawaxq296za2q6n1gylh"; + version = "1.0.0.1"; + sha256 = "04wglc9ddf9g2amr2h9pdcv0pzn6gqsqg67hds5zwz1jjdbk52ad"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; @@ -167957,8 +168701,8 @@ self: { ({ mkDerivation, base, ki, unliftio-core }: mkDerivation { pname = "ki-unlifted"; - version = "1.0.0"; - sha256 = "0751sy948gng9a0bqp127xsdgl4gf5acnj6vrvsmr7lw9x67ap04"; + version = "1.0.0.1"; + sha256 = "1nfa6g2qi791aqg0whdf02pzng01wvbcxvzy6yf5sa20c6fsqn4b"; libraryHaskellDepends = [ base ki unliftio-core ]; description = "A lightweight structured-concurrency library"; license = lib.licenses.bsd3; @@ -168509,8 +169253,8 @@ self: { }: mkDerivation { pname = "konnakol"; - version = "0.1.0.0"; - sha256 = "10hykji062b54q95yv1f0l8pxapxzyhk1l872nyjahn0ph0bkx1n"; + version = "0.3.0.0"; + sha256 = "1vjyp290d9s72fgsqmdixqaprsal8i6sxqrbnqf1xqyhn04pjnk2"; libraryHaskellDepends = [ base colour containers diagrams-lib diagrams-svg random split tidal ]; @@ -170158,6 +170902,27 @@ self: { broken = true; }) {}; + "landlock" = callPackage + ({ mkDerivation, base, exceptions, filepath, process, QuickCheck + , tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck + , unix + }: + mkDerivation { + pname = "landlock"; + version = "0.1.0.0"; + sha256 = "19l95a4wajdzml38l9251yklxsgk70ky29x7bmldyn6nagdqgdap"; + libraryHaskellDepends = [ base exceptions unix ]; + testHaskellDepends = [ + base filepath process QuickCheck tasty tasty-expected-failure + tasty-hunit tasty-quickcheck + ]; + doHaddock = false; + description = "Haskell bindings for the Linux Landlock API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lang" = callPackage ({ mkDerivation, base, bytestring, http-streams, Mapping }: mkDerivation { @@ -170421,8 +171186,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.2.0"; - sha256 = "0sm85abxp3ia9450mxwnqbz00hcmafdbzsj0ynp4l95rxw11j0q6"; + version = "0.2.1"; + sha256 = "0ii5mlxzy47gs91amriv1zsbb0myayanwsw3qwz4p29m09fqjpic"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -172071,8 +172836,8 @@ self: { pname = "lattices"; version = "2.0.3"; sha256 = "1mn78xqwsksybggnsnx8xkmzlc9his1si14dy5v6vmlchkjym9qg"; - revision = "3"; - editedCabalFile = "0zjrrchi6bi7jkcj6id8bhc2hd0v6c7n8bxli1fb71k0zmpxhbw1"; + revision = "4"; + editedCabalFile = "0nkcdqb3gsp1lqpj7hv4knndj7p258j0cp4cbqx7jixc93gkq044"; libraryHaskellDepends = [ base base-compat containers deepseq ghc-prim hashable integer-logarithms QuickCheck semigroupoids tagged transformers @@ -173289,7 +174054,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "lens_5_1_1" = callPackage + "lens_5_2" = callPackage ({ mkDerivation, array, assoc, base, base-compat, base-orphans , bifunctors, bytestring, call-stack, comonad, containers , contravariant, criterion, deepseq, distributive, exceptions @@ -173303,10 +174068,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.1.1"; - sha256 = "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc"; - revision = "1"; - editedCabalFile = "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"; + version = "5.2"; + sha256 = "126ivkkcacd15899phrwq6zc6zwllnshplkrrf59x3a6vsz2wgmk"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -173378,16 +174141,14 @@ self: { license = lib.licenses.mit; }) {}; - "lens-aeson_1_2_1" = callPackage + "lens-aeson_1_2_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, lens , scientific, text, text-short, unordered-containers, vector }: mkDerivation { pname = "lens-aeson"; - version = "1.2.1"; - sha256 = "08x0vbkay8d6s24fzy2iria0hl9pmq891cnzm6zl0j9j53z9jw9l"; - revision = "3"; - editedCabalFile = "0lqpl5fhl94fm3xcwf8ssz7yg9nyfxp9bw2z959x7hg6bcqmv9p1"; + version = "1.2.2"; + sha256 = "0wwmg0zv2561dmmbil829dw6qmdl02kfs690iy549nbznj2kil8l"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text text-short unordered-containers vector @@ -174260,8 +175021,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.6.3"; - sha256 = "1zfnyxplfffs8739b3p6yxy706nkm0qsnxn4yxyrrris637ync3f"; + version = "0.6.4"; + sha256 = "071r30yvwxcbgdk9biynjl9j7vy1n98chw9qgrjkrlw2b2i1l8bk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq hashable ]; @@ -174407,6 +175168,18 @@ self: { license = lib.licenses.bsd3; }) {ffi = null; inherit (pkgs) libffi;}; + "libffi_0_2" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "libffi"; + version = "0.2"; + sha256 = "08pp09cjygvc0ddm7gdrrk0hpcy3bsnp8g7z9cyix2ckdg43rldq"; + libraryHaskellDepends = [ base bytestring ]; + description = "A binding to libffi"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "libffi-dynamic" = callPackage ({ mkDerivation, base, contravariant, ffi, hashable, intern }: mkDerivation { @@ -175093,6 +175866,8 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -175571,8 +176346,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.2.2"; - sha256 = "1pm7vfrk0vx3rg5ay81xmjfjw1l3s1cqa70frlwqnky7r2csds2h"; + version = "0.10.2.3"; + sha256 = "1kq96cp9czf358gykai2vcmynnd7zivqja4pb3f8bif9ypln9vai"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -181911,6 +182686,8 @@ self: { pname = "machines"; version = "0.7.3"; sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; + revision = "1"; + editedCabalFile = "00mp54mb9br390cnk3i60j4i2byp625swjcnq92csxscj86i0awd"; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers @@ -184024,6 +184801,8 @@ self: { pname = "massiv"; version = "1.0.1.1"; sha256 = "1yg594y0v8bpymd5g6hy8a7cy2hbvlpyxm9hnq3pprbhbcrrx22w"; + revision = "1"; + editedCabalFile = "1rcjcd3sf4qlrwk026sw5nz9i5jagpga83jyp5ij3igkg2ffps21"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler unliftio-core vector @@ -184033,6 +184812,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "massiv_1_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions + , primitive, random, scheduler, unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "1.0.2.0"; + sha256 = "15ckrsavsrkgm4c9al2jlk1r4nm2mdjshw1ksbkh8m65l3l5kcrr"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions primitive random scheduler + unliftio-core vector + ]; + testHaskellDepends = [ base doctest ]; + description = "Massiv (Массив) is an Array Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, criterion , data-default-class, deepseq, doctest, exceptions, filepath, hspec @@ -185770,6 +186567,8 @@ self: { pname = "megaparsec"; version = "9.2.1"; sha256 = "1zz92mkwyhvvh8c8nc7cfz8cw2g9374na11k2gb6dbm4pabq69vb"; + revision = "1"; + editedCabalFile = "04ykwffsscwybjdzq225b3dir1r38xabz2q8aypd7x148dinyxfk"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -185791,6 +186590,8 @@ self: { pname = "megaparsec-tests"; version = "9.2.1"; sha256 = "1w9maxfld3by01kl8z0a4v64y2vm5rmsdss6n57mr3j43ng2isr9"; + revision = "1"; + editedCabalFile = "0q7rp52v7x1qbhf4paqk5i99pn3n30lgvz6ff3mabb1h1nb2alh5"; libraryHaskellDepends = [ base bytestring containers hspec hspec-expectations hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -187525,6 +188326,8 @@ self: { pname = "microlens-th"; version = "0.4.3.10"; sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; + revision = "1"; + editedCabalFile = "142wksvc854qmd665qd6mwzik8g02yzfpjk1fpxw4mlcns06y4m2"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -187584,22 +188387,21 @@ self: { }) {}; "microstache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, filepath, hspec, parsec, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, base, base-orphans, bytestring, containers + , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "microstache"; - version = "1.0.2.1"; - sha256 = "12i2sx2rv2ai77m95gvfm93jcjk6q5i4cgfyxjrhyx3ll94z775v"; - revision = "2"; - editedCabalFile = "0vjqffb0960kc4k32lgbsjl1mwah129m3ci6lyqyw7slqripw5fp"; + version = "1.0.2.2"; + sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers hspec parsec text + aeson base base-orphans bytestring containers parsec tasty + tasty-hunit text ]; description = "Mustache templates for Haskell"; license = lib.licenses.bsd3; @@ -188711,8 +189513,8 @@ self: { }: mkDerivation { pname = "misfortune"; - version = "0.1.2"; - sha256 = "0jnws1sc5dxbg03iy2l3glimm3qk2z0pcvyk4518y7a4n0wnxf89"; + version = "0.1.2.1"; + sha256 = "0shzqc8yz4nrz31b55fsl00bkgbvj1kzdf2j845vwpnvmrwfr1g1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -188726,7 +189528,6 @@ self: { ]; description = "fortune-mod clone"; license = lib.licenses.mit; - mainProgram = "misfortune"; }) {}; "mismi-core" = callPackage @@ -189230,6 +190031,8 @@ self: { pname = "mmark"; version = "0.0.7.6"; sha256 = "1zahgky724s0x89c9jp4fa6m0kzh461sc2lcpwaw61hqgamaay4c"; + revision = "1"; + editedCabalFile = "0jpin5hrh2wi5yqzzccww3rb94ylb3i7y0wm16q8knq4680fq8zx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -189388,8 +190191,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.5.0"; - sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3"; + version = "0.1.6.0"; + sha256 = "0fbpjqr9vv10s0kn9i6l50csym40zrpa8yynm884a1580mq5w2d6"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = lib.licenses.mit; @@ -189401,8 +190204,8 @@ self: { ({ mkDerivation, base, directory, mmsyn3, process }: mkDerivation { pname = "mmsyn4"; - version = "0.6.3.0"; - sha256 = "06lp72rbkna5hrw8zbwz7wqijchcbc9y1nl5d1gp4z3gq1324za5"; + version = "0.6.4.0"; + sha256 = "14x9mjsrfdzghdw0jyisnb0vykb896r9fy0hmclx0vs9hyzlxlcf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mmsyn3 process ]; @@ -189455,8 +190258,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr-array"; - version = "0.3.1.0"; - sha256 = "1xmi3qbifk4hw9lgm33ldh6cfrwhppr7kg0cimlv2vmzpcz2ski2"; + version = "0.3.3.0"; + sha256 = "1vh2k1xddflaq3j15wqygnlsgf7vn7gfqa5gcfwp945j8mlyhq76"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189504,8 +190307,8 @@ self: { }: mkDerivation { pname = "mmsyn7l"; - version = "0.9.0.0"; - sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq"; + version = "0.9.1.0"; + sha256 = "0c8gcvbb2xw89cnf2h85cbm9n2zxqdqc0kkbh9w3vx2zsyy5865i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189514,7 +190317,7 @@ self: { executableHaskellDepends = [ base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; - description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; + description = "Modifies the amplitudes of the sounds representations created by mmsyn7ukr-array and mmsyn7ukr packages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn7l"; @@ -189559,12 +190362,29 @@ self: { mainProgram = "mmsyn7ukr"; }) {}; + "mmsyn7ukr-array" = callPackage + ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + , mmsyn7ukr-common, process + }: + mkDerivation { + pname = "mmsyn7ukr-array"; + version = "0.2.0.0"; + sha256 = "0wh0a141mwkn0bzv4r4kzzfw1xdg6l70pvpibm60d5slknlm4spz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + ]; + description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h-array, dobutokO2-array and other similar packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmsyn7ukr-common" = callPackage ({ mkDerivation, base, directory, mmsyn3, process }: mkDerivation { pname = "mmsyn7ukr-common"; - version = "0.1.1.0"; - sha256 = "000xkm0yvj6sxmnkzax98gc3rv0cfkfglfznf84p32axmxa4vg0q"; + version = "0.2.0.0"; + sha256 = "0d7i1xhys493mx6ynn7zx7jidjffkkmnid5llwyk8m4040riw8ay"; libraryHaskellDepends = [ base directory mmsyn3 process ]; description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX"; license = lib.licenses.mit; @@ -189834,6 +190654,8 @@ self: { pname = "modern-uri"; version = "0.3.4.4"; sha256 = "19fffy7kb7ibajagdryjy872x56045zi6c1div8wvr8aisd55qsz"; + revision = "2"; + editedCabalFile = "0izxigj0rvzz25gg3k1y09hcx7rx1xvq6dc5awi4kzdw323nvmv4"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -190304,6 +191126,8 @@ self: { pname = "monad-chronicle"; version = "1.0.1"; sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; + revision = "1"; + editedCabalFile = "09ibn640fkqlvgqxkrwm1dwr78amy399b6jysxklb6nngj10rcdc"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -192127,8 +192951,8 @@ self: { pname = "monoid-extras"; version = "0.6.1"; sha256 = "1nj5rfax9lmr1pprvgdgq90am9mknx9iv7s84smv6qaw050356jf"; - revision = "1"; - editedCabalFile = "0csv73ism5b94lhbp95s63rqhyaaphrz2cci2407a10d3ssswki9"; + revision = "2"; + editedCabalFile = "04zbzq7dbv0ddpc1dxrxn9jfyg1xj8sar6ngzhc0cji72cail503"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -197559,6 +198383,28 @@ self: { inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs.xorg) libX11;}; + "nanovg_0_8_1_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew + , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector + }: + mkDerivation { + pname = "nanovg"; + version = "0.8.1.0"; + sha256 = "1yzabd2l8z77dsgby97dzv0h38a6w554kmhp6hsfx3j24n0h0rnv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring containers text vector ]; + librarySystemDepends = [ glew libGL libGLU libX11 ]; + libraryPkgconfigDepends = [ freetype glew ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; + description = "Haskell bindings for nanovg"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) freetype; inherit (pkgs) glew; + inherit (pkgs) libGL; inherit (pkgs) libGLU; + inherit (pkgs.xorg) libX11;}; + "nanovg-simple" = callPackage ({ mkDerivation, base, GLFW-b, monad-loops, nanovg, OpenGL , safe-exceptions, text @@ -198858,8 +199704,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "8"; - editedCabalFile = "1lkclsfxb7kn8nmghrrk7j1jzqi1z6amq91h43gfvmpnm7x6cvwl"; + revision = "9"; + editedCabalFile = "0srgxcgzzkrq96zg8vk61wnr4mrvgcxbgpdh2kklsfc2p6phzzp7"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -199993,6 +200839,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-transport_0_5_5" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , transformers + }: + mkDerivation { + pname = "network-transport"; + version = "0.5.5"; + sha256 = "0zpr8wfyy91jfscjddrhbq7vy91agisvvlrxyh8szcsprvrgaj42"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable transformers + ]; + description = "Network abstraction layer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-transport-amqp" = callPackage ({ mkDerivation, amqp, async, base, bytestring, cereal, containers , exceptions, lens-family, lens-family-th, network-transport @@ -200810,6 +201672,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "ngx-export-healthcheck" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , enclosed-exceptions, http-client, http-client-brread-timeout + , http-types, ngx-export, safe, snap-core, snap-server, text, time + , vector + }: + mkDerivation { + pname = "ngx-export-healthcheck"; + version = "1.5"; + sha256 = "00qzkyfxzh8c0hmj0xzsisncvww1ar2k9a6ngkrgaypl96abbkln"; + revision = "1"; + editedCabalFile = "05yhi77x339byxln8b2mvkslrkmw7jpflaj1ma8jc8gbxbk868lp"; + libraryHaskellDepends = [ + aeson async base bytestring containers enclosed-exceptions + http-client http-client-brread-timeout http-types ngx-export safe + snap-core snap-server text time vector + ]; + description = "Active health checks and monitoring of Nginx upstreams"; + license = lib.licenses.bsd3; + }) {}; + + "ngx-export-log" = callPackage + ({ mkDerivation, base, bytestring, ngx-export, ngx-export-tools + , template-haskell + }: + mkDerivation { + pname = "ngx-export-log"; + version = "1.5"; + sha256 = "0jixskgyv4f31qhxqlhdbg93ib7lj9vwgrbqh4ha1z74gsyx4axv"; + libraryHaskellDepends = [ + base bytestring ngx-export ngx-export-tools template-haskell + ]; + description = "Native Nginx logging from configuration files and Haskell handlers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ngx-export-tools" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe , template-haskell @@ -203281,6 +204181,8 @@ self: { pname = "numeric-kinds"; version = "0.2.0"; sha256 = "0ba882bjp7gzqdfy15jgi8kbls2cjbp7860vzc7winzlsf0zqdy1"; + revision = "1"; + editedCabalFile = "1zcd3smy5y249pghkfpcc5dydr4i452ps9g1z9isfsn91r0ibfh9"; libraryHaskellDepends = [ base type-compare ]; description = "Type-level numeric types and classes"; license = lib.licenses.asl20; @@ -203305,8 +204207,8 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "3"; - editedCabalFile = "0641bzwzjd85xk8pjnh5jqd4m5sd50334vps9jbid3jhwlwycqg0"; + revision = "4"; + editedCabalFile = "0i4y8p6xyk7vnk9qwf496jb3y40fn8jxhkcszqfsgf7znjvlbhn2"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework @@ -205372,6 +206274,8 @@ self: { pname = "opaleye"; version = "0.9.3.3"; sha256 = "19q81zbp2gd1alsm891i2xh7vd985paa5b04pm0bhrafajx7k4na"; + revision = "1"; + editedCabalFile = "13r6p37in9s30nw0mj6rzp0zdl96x8vsf2fxpxdbcjnmf13d0hkl"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -207001,21 +207905,22 @@ self: { "oplang" = callPackage ({ mkDerivation, base, containers, directory, filepath, megaparsec - , mtl, optparse-applicative, process, text, text-builder + , mtl, optparse-applicative, process, text, text-builder-linear , transformers }: mkDerivation { pname = "oplang"; - version = "0.2.0.0"; - sha256 = "1bacn4irdipn43gh2qq8ja6z79q21j2yrnvvvjdfdmhcvc07kkr1"; + version = "0.3.0.1"; + sha256 = "0a7b8afvjhba0rcqngw16wzjpnk5cdrb0145jpxnyww9dikw77q0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers directory filepath megaparsec mtl - optparse-applicative process text text-builder transformers + optparse-applicative process text text-builder-linear transformers ]; - description = "Compiler for OpLang, an esoteric programming language"; + description = "Stack-based esoteric programming language"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "oplang"; }) {}; @@ -207403,6 +208308,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "optparse-applicative-cmdline-util" = callPackage + ({ mkDerivation, attoparsec, base, optparse-applicative, text }: + mkDerivation { + pname = "optparse-applicative-cmdline-util"; + version = "0.2.0"; + sha256 = "13nr0biqhc2sd30xxn7sms4f0wl629bcahp3hmmcgf45nl38vpbh"; + libraryHaskellDepends = [ + attoparsec base optparse-applicative text + ]; + description = "Utility functions for working with optparse-applicative"; + license = lib.licenses.agpl3Only; + }) {}; + "optparse-applicative-simple" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base-prelude , optparse-applicative, rerebase, text @@ -209358,9 +210276,9 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; - "pandoc_2_19" = callPackage + "pandoc_2_19_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions , commonmark-pandoc, connection, containers, data-default, deepseq , Diff, directory, doclayout, doctemplates, emojis, exceptions @@ -209370,37 +210288,38 @@ self: { , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup , JuicyPixels, lpeg, mtl, network, network-uri, pandoc-lua-marshal , pandoc-types, parsec, pretty, pretty-show, process, random, safe - , scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-collation, unicode-transforms, unix, xml - , xml-conduit, xml-types, yaml, zip-archive, zlib + , scientific, servant-server, SHA, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath + , text, text-conversions, time, unicode-collation + , unicode-transforms, unix, wai, wai-extra, warp, xml, xml-conduit + , xml-types, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.19"; - sha256 = "1gqw2bl23v60p491ml7n76pj04f7ggannswrakmqs5afidr16p22"; + version = "2.19.1"; + sha256 = "107r2hqljjic503w198qz16gv7gmkl7w8ir1w5riba0kvz9nqs3c"; configureFlags = [ "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob gridtables - haddock-library hslua hslua-aeson hslua-module-doclayout - hslua-module-path hslua-module-system hslua-module-text - hslua-module-version http-client http-client-tls http-types ipynb - jira-wiki-markup JuicyPixels lpeg mtl network network-uri - pandoc-lua-marshal pandoc-types parsec pretty pretty-show process - random safe scientific SHA skylighting skylighting-core split syb - tagsoup temporary texmath text text-conversions time - unicode-collation unicode-transforms unix xml xml-conduit xml-types - yaml zip-archive zlib + aeson aeson-pretty array attoparsec base base64 binary blaze-html + blaze-markup bytestring case-insensitive citeproc commonmark + commonmark-extensions commonmark-pandoc connection containers + data-default deepseq directory doclayout doctemplates emojis + exceptions file-embed filepath Glob gridtables haddock-library + hslua hslua-aeson hslua-module-doclayout hslua-module-path + hslua-module-system hslua-module-text hslua-module-version + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels lpeg mtl network network-uri pandoc-lua-marshal + pandoc-types parsec pretty pretty-show process random safe + scientific servant-server SHA skylighting skylighting-core split + syb tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix wai xml xml-conduit + xml-types yaml zip-archive zlib ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base safe wai-extra warp ]; testHaskellDepends = [ base bytestring containers Diff directory doctemplates exceptions filepath Glob hslua mtl pandoc-types process tasty tasty-golden @@ -209988,8 +210907,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.22.2"; - sha256 = "1m5lln26ixzswx6pb1n7iv99w8i9gii6lhg07whg56jl2gvfghk0"; + version = "1.22.2.1"; + sha256 = "17b5c4b9jmx2gca1wk9vlnvvlzdw21qiqc0bpikkkiv7kl99drsc"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -210892,8 +211811,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "4"; - editedCabalFile = "02y9cnk5vkz45zkhlimfa3rx6xsx6zy80aryc3q7rvi678gn7zqr"; + revision = "5"; + editedCabalFile = "1q45wzpf2sda0244l55gakl3g5zqhcb27m86nhl3vslcjc35mpbf"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -211180,6 +212099,8 @@ self: { pname = "park-bench"; version = "0.1.0.1"; sha256 = "0ricvj3q4y8xdb47py9q6j23xw6fcy6l1000qm5naqkqkfz6rp35"; + revision = "1"; + editedCabalFile = "14hm88h09hcyx85g4qw3fpv662l39a536d6ydfrs6lv0d17bwlfy"; libraryHaskellDepends = [ base bytestring text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; @@ -212173,8 +213094,8 @@ self: { pname = "password"; version = "3.0.1.0"; sha256 = "1kdc1lwya9sq3vb5wvvs2bz0z38mqn9cpim4f6awym99c57g01rk"; - revision = "2"; - editedCabalFile = "1w4k1i0zz9rnzapmvnnh8q2q05s1r9v4gsqrcnwiy1q45ksx42dc"; + revision = "3"; + editedCabalFile = "151z62mwqzblddcwj83dhwz2qfj53g0nl6sbdcsf489xbb9z3vk9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -214657,7 +215578,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_0_3" = callPackage + "persistent_2_14_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -214668,10 +215589,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.0.3"; - sha256 = "0r0pz7badjb2m47prhgs3hpwfcwqg07nimbwhnhc7mx3n0n2sjp6"; - revision = "1"; - editedCabalFile = "0bqs3l8f2014c82hc082x0ynhxkxsz37pm8c2nr0h9hn7993fvbn"; + version = "2.14.1.0"; + sha256 = "1jzmqxlvyzgp25rczlp1pi8msd776gw6jlf141zlqrs3523qc0wq"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -215445,8 +216364,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.6"; - sha256 = "1hvja9yh40nqifvy0fsamdfj3f9ps85g187c7m3hg2yqz4w8pm05"; + version = "0.1.0.7"; + sha256 = "0fkshbf35mnlx4aqkij0lzzmpfxw34zkwgq8s2lm3rrrqw7gw59l"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent resource-pool resourcet template-haskell @@ -216143,8 +217062,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-basis"; - version = "0.1.0.0"; - sha256 = "1qdyg9f8hk0cklf15x7akchrvfj7rya7rmzc16i8fk0bl4lyfall"; + version = "0.1.1.0"; + sha256 = "0fpsavprp4l39l0mj7rwckrsbwdphzxs61y24ds1dg3zvhphn06c"; libraryHaskellDepends = [ base ]; description = "A basics of the phonetic-languages functionality"; license = lib.licenses.mit; @@ -216363,8 +217282,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.5.0.0"; - sha256 = "02jxqqwcws8wl5a1s2q97w364bv6vwy4mwrlzmmwh5cp60p3dm20"; + version = "0.6.0.0"; + sha256 = "0bryrk05xpdz3dx96vwma91kig8xs6mkdlbpslk9qxf8b55yrnd2"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-permutations-array subG @@ -216405,8 +217324,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.19.0.0"; - sha256 = "0y9mmfjxkbxpw4iggafvm80324zjrljwkc314439gydhf4961sf9"; + version = "0.20.0.0"; + sha256 = "0w22h8s272rnasqyzlxx0badw5dkv99sxrgbflb86hj6lsm06g1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216440,13 +217359,18 @@ self: { }) {}; "phonetic-languages-simplified-examples-common" = callPackage - ({ mkDerivation, base, heaps, phonetic-languages-ukrainian-array }: + ({ mkDerivation, base, heaps + , phonetic-languages-simplified-properties-array + , phonetic-languages-ukrainian-array + , ukrainian-phonetics-basic-array + }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.4.6.0"; - sha256 = "13i8pq52bfmxvidvykn1hcy9yv2i8yni76mcnbmfwdbd1sy615pn"; + version = "0.5.0.0"; + sha256 = "0abby7z7zys9dj8w4xk3289jxl39i4kqdzb3cq5rjvacw5z0im6a"; libraryHaskellDepends = [ - base heaps phonetic-languages-ukrainian-array + base heaps phonetic-languages-simplified-properties-array + phonetic-languages-ukrainian-array ukrainian-phonetics-basic-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; @@ -216466,8 +217390,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.17.0.0"; - sha256 = "0gm5pn7qass74x7xjgshq1hlyjvdm9jvfjvnwh6g0f607g7zzsrp"; + version = "0.18.1.0"; + sha256 = "1frn5zijjv1054lwd7mvp4klv96ywpbxv5msnyl7a2bbikwrdhqs"; libraryHaskellDepends = [ base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel phonetic-languages-basis phonetic-languages-constraints-array @@ -216486,13 +217410,15 @@ self: { "phonetic-languages-simplified-generalized-examples-common" = callPackage ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics + , phonetic-languages-simplified-generalized-properties-array }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.4.0.0"; - sha256 = "0bhjmnj1k54c7xg3m9p5rlnqq4csf872ap2a2axf4d6caizz29cf"; + version = "0.5.0.0"; + sha256 = "0mma7d4hjd45fb7nzhpc438qfjfhkrd59rrm734nw8z5i9j6sv35"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics + phonetic-languages-simplified-generalized-properties-array ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; @@ -216500,17 +217426,17 @@ self: { }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage - ({ mkDerivation, base, phonetic-languages-basis - , phonetic-languages-phonetics-basics + ({ mkDerivation, base, lists-flines, mmsyn2-array + , phonetic-languages-basis, phonetic-languages-phonetics-basics , phonetic-languages-rhythmicity }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.10.1.0"; - sha256 = "04z1xm1da9rhiajkfdyflsbmd0dqpzsjhh1xl469p4795xfv3k2l"; + version = "0.11.0.0"; + sha256 = "0j025aahsfywrf76mqg1p80kri7n8q2madg5qc3l6frlwgxhk44m"; libraryHaskellDepends = [ - base phonetic-languages-basis phonetic-languages-phonetics-basics - phonetic-languages-rhythmicity + base lists-flines mmsyn2-array phonetic-languages-basis + phonetic-languages-phonetics-basics phonetic-languages-rhythmicity ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; @@ -216553,19 +217479,19 @@ self: { }) {}; "phonetic-languages-simplified-properties-array" = callPackage - ({ mkDerivation, base, phonetic-languages-basis - , phonetic-languages-rhythmicity + ({ mkDerivation, base, lists-flines, mmsyn2-array + , phonetic-languages-basis, phonetic-languages-rhythmicity , phonetic-languages-simplified-base , phonetic-languages-simplified-properties-array-common , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.14.0.0"; - sha256 = "0b8vi0f4phz9jd6n92cv9fravqx6dz8dkfs0gk0qavln13p6nj98"; + version = "0.15.0.0"; + sha256 = "1p8mdrz1k6352rfcfmwnvs338bkbhzj89ag1swd9rxa79igsv87v"; libraryHaskellDepends = [ - base phonetic-languages-basis phonetic-languages-rhythmicity - phonetic-languages-simplified-base + base lists-flines mmsyn2-array phonetic-languages-basis + phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-properties-array-common ukrainian-phonetics-basic-array ]; @@ -216579,8 +217505,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array-common"; - version = "0.1.0.0"; - sha256 = "19c7y4v5fk3dkxpm1hj6xdw0kgfaqv148ws9if26cyjjhzsqkxl9"; + version = "0.2.0.0"; + sha256 = "1c61pi61kcbr70xfrxiq50frg7rd9sabj7834x3lhlix41s6rhld"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-rhythmicity ]; @@ -216607,6 +217533,8 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-simplified-properties-lists" = callPackage @@ -217057,12 +217985,12 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "pid"; - version = "0.1.0.1"; - sha256 = "0qabdl1y7k7ycsg4r4hhq8lvq8vaps5rhv4r45mwfbj90vm1n9wa"; + version = "0.1.0.2"; + sha256 = "01kyc4rdxqnx2rvb8lkzf8k0wma9ipzkn0x91p2d999r428n7r18"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl ]; - description = "a simple pid controller"; + description = "a simple PID controller"; license = "unknown"; mainProgram = "pid"; }) {}; @@ -217395,8 +218323,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.10"; - sha256 = "04ak277hv2zccfi1y8639cjz3sm881i3cjli35x7a17hn7dy8l38"; + version = "0.1.0.12"; + sha256 = "1pz6nwxwn9k7l64n9185rgsyqsa85wb3vil52l9ylvsnkdykqz6w"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -217980,8 +218908,8 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; - revision = "4"; - editedCabalFile = "0dis0i8l76cd94qgabvjbmn7iqwnqqdf8kgj4d5nby0xc02mqbw9"; + revision = "5"; + editedCabalFile = "05xv3l5m02ksppdifmsvva14dh0r341z07glc4a65a9rbvr28gq8"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -219882,8 +220810,8 @@ self: { }: mkDerivation { pname = "podenv"; - version = "0.1.0"; - sha256 = "18r1hx5bks645fw29zpbl5bn4cssdl9mz62ih8i90bwpwf4glxph"; + version = "0.2.0"; + sha256 = "1xm4ii3i4wsbd7qv0la1dsh17gh5640gb0frwciv548gll5dk9k6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220554,8 +221482,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "4"; - editedCabalFile = "0i1vd36mpbls1crs5wdca77f6wjqimy6f9b9kk7kr3jz7zgqhnz7"; + revision = "5"; + editedCabalFile = "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -220811,8 +221739,8 @@ self: { ({ mkDerivation, base, containers, polysemy }: mkDerivation { pname = "polysemy-kvstore"; - version = "0.1.2.0"; - sha256 = "1wa9rn948gaaz4z7pk0k2k023rap1ia3xxaxyqw5wzalfb2bm2zx"; + version = "0.1.3.0"; + sha256 = "1w6b1iwfngsilf1inxpg0y159k16ybdlqkdkdkiyjys7wvdgv24d"; libraryHaskellDepends = [ base containers polysemy ]; description = "KVStore effect for polysemy"; license = lib.licenses.mit; @@ -221581,8 +222509,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.7"; - sha256 = "0kcb0fvbs340cpqzh9vxi7vkisgkv2afnvr5fjq647lwisncbxgz"; + version = "0.1.0.8"; + sha256 = "0ybbzbyv7zmzrz1bnx61aax1s4ckv55pmyf2rmba8gf4gf5kqj79"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -221984,8 +222912,8 @@ self: { pname = "portray"; version = "0.2.0"; sha256 = "1kzzvwqphlg1dmd486ijkv6vsqmxnp8h05mwc8590yjxdln5vzdw"; - revision = "2"; - editedCabalFile = "14fdpmwh4ghdc97361l7mny4p2fai2v6g445lw0ybjbxg44cij5r"; + revision = "3"; + editedCabalFile = "0zszhxd9f51wb15rw5rvz6cb20kbf2f8r8xn2dksm5mdnyiv3pgz"; libraryHaskellDepends = [ base containers text wrapped ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit text @@ -222001,8 +222929,8 @@ self: { pname = "portray-diff"; version = "0.1.0.1"; sha256 = "1da884cj865q6g1bd1fhcazyl1nzxb0pk2nvhcpp4iqkjvhyd8hw"; - revision = "2"; - editedCabalFile = "112sp759wd5fr0nqrrnsj9m7pc209m4gyd1k16ps09gbwn40whd6"; + revision = "3"; + editedCabalFile = "1wikgdbb1bngppqq8n4pgfqaf040rpfn5hdzspcycc8i7z8gi5mw"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; @@ -222017,8 +222945,8 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; - revision = "2"; - editedCabalFile = "0bqr29g47rqdwrc2c3zsizgbis0wdwh1pz3a40pfr0va6c7fsj9m"; + revision = "3"; + editedCabalFile = "05y5cci0kip5ribjkkinv7nqfvbjsq7z26vj3b170vd7awgfb2xq"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; @@ -222032,8 +222960,8 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; - revision = "2"; - editedCabalFile = "0ynqqv3ilfwnj5vzs7rlng1w6r6zzqph0scsvy51dzy5al96hkgz"; + revision = "3"; + editedCabalFile = "0c6ld7l8k4kk66rikxknq0c6mjc7dwa1bw7bqbajqfdb0jjbaafc"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; @@ -222049,8 +222977,8 @@ self: { pname = "portray-pretty"; version = "0.1.0.2"; sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; - revision = "2"; - editedCabalFile = "1i6lgiin3k8d6y683vn5jk5mnbnc2hlamf3n48yvx6z19p65rmzi"; + revision = "3"; + editedCabalFile = "1602wqwdli0h1rmpf5pg5205pikfk9b7d1ss9jhxbwbs1qq6zcpf"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework @@ -222069,8 +222997,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.0"; sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; - revision = "2"; - editedCabalFile = "0b944c4fws0pvfq9vbr4dvxz6irmqdwvgv6qg1r3bhz2lqg5q434"; + revision = "3"; + editedCabalFile = "0iwl1g9jrkrvxl4b7bns09vfwrzpr6k475kmnhkija1wr0wkd4p9"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -222383,8 +223311,8 @@ self: { }: mkDerivation { pname = "posplyu"; - version = "0.1.0.1"; - sha256 = "09yafx5d82h4vsx2pp2hccwy74b7nhbys971g86qcg6yf24ha621"; + version = "0.1.0.2"; + sha256 = "091cwg07wzhqcrbm285n6yzgp0sa19a0q0y2f5q52zdq815wc96x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226179,8 +227107,8 @@ self: { ({ mkDerivation, base, directory, mmsyn3, process, sublists }: mkDerivation { pname = "process-sequential"; - version = "0.1.1.0"; - sha256 = "19dv9sk1hk4ny0zh8amr9bddmjxc94r8h3cims9ylhrrb34zz90f"; + version = "0.1.2.0"; + sha256 = "1pspx5w36hzc1gc2vmnivnc9bjpccww9mk184m3zsh563w55iwqw"; libraryHaskellDepends = [ base directory mmsyn3 process sublists ]; description = "A test suite for the complex multi files multi level processment"; license = lib.licenses.mit; @@ -228376,8 +229304,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.8.2"; - sha256 = "03azqd2wxs7p48ixc1zhy65axgaacnndcbxgrv6f026szpllky55"; + version = "0.16.8.3"; + sha256 = "1qyzgpwl74cxg1kyf0qyildrcf42q0icqi7ym1fyx4sh759ggd26"; libraryHaskellDepends = [ base bytestring contravariant profunctors strict-list text time vector @@ -229427,6 +230355,28 @@ self: { license = lib.licenses.mit; }) {}; + "pusher-http-haskell_2_1_0_11" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.1.0.11"; + sha256 = "1vrpdj0z41zhpfy4lk87w4fyfvrp27rvqds9j5s2wyxj95k2scm5"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -230921,6 +231871,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "quickcheck-dynamic" = callPackage + ({ mkDerivation, base, QuickCheck, random }: + mkDerivation { + pname = "quickcheck-dynamic"; + version = "1.0.0"; + sha256 = "0c4kagvlwihqz14kwdawkv9gg1ncq36icqdxyz3lyk5hyijxr56n"; + libraryHaskellDepends = [ base QuickCheck random ]; + description = "A library for stateful property-based testing"; + license = lib.licenses.asl20; + }) {}; + "quickcheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, QuickCheck }: mkDerivation { @@ -230949,24 +231910,23 @@ self: { "quickcheck-instances" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time - , OneTuple, QuickCheck, scientific, splitmix, strict, tagged, text - , text-short, these, time, time-compat, transformers + , OneTuple, primitive, QuickCheck, scientific, splitmix, strict + , tagged, text, text-short, these, time, time-compat, transformers , transformers-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.27"; - sha256 = "10vb3rl1ma9x4qdych9vn8gj9kngkqs2b97f4s6s1a908ddxv4m5"; - revision = "2"; - editedCabalFile = "13g7mf6brxxwp99n5a0pazjq4r3i5ckzq6kflcfaknzl1gxvmnhp"; + version = "0.3.28"; + sha256 = "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable - integer-logarithms old-time OneTuple QuickCheck scientific splitmix - strict tagged text text-short these time time-compat transformers - transformers-compat unordered-containers uuid-types vector + integer-logarithms old-time OneTuple primitive QuickCheck + scientific splitmix strict tagged text text-short these time + time-compat transformers transformers-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ - base containers QuickCheck tagged uuid-types + base containers primitive QuickCheck tagged uuid-types ]; benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; @@ -231927,6 +232887,8 @@ self: { pname = "quotet"; version = "0.0.1.1"; sha256 = "16fwbf9q2ivpi3j7y26lsbqvwwk7vidjn6q9iz4x6sq8adhy45rz"; + revision = "1"; + editedCabalFile = "0c0war9bpi0mmvgca6kc5aq99pz9wk469lvyds8glxlj4970i8qd"; libraryHaskellDepends = [ base mtl template-haskell th-compat ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; @@ -231972,7 +232934,9 @@ self: { ]; description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pldUkr"; + broken = true; }) {}; "r3x-haskell-sdk" = callPackage @@ -232518,8 +233482,8 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "2.0.0.1"; - sha256 = "051qiv8jqjrh79drgrdaa72qmsxb4pwizpi576c8pcgpg6ld6ilv"; + version = "2.0.0.2"; + sha256 = "04g2ifqb3incjsc8jxs2fkl5jw5690p1s33slqbvbq8qqb3f4vv8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -234157,8 +235121,8 @@ self: { }: mkDerivation { pname = "reactive-banana"; - version = "1.3.0.0"; - sha256 = "05jml1wxvj6453p98a2km8qvb0gs17y68givp1nf1l41r5da1fkk"; + version = "1.3.1.0"; + sha256 = "06cmr70cbvnvm69lnj2hkxfmznqj97rxs7y6baxpjkyhm0lsv1dl"; libraryHaskellDepends = [ base containers hashable pqueue semigroups these transformers unordered-containers vault @@ -236488,23 +237452,22 @@ self: { "reflex-gadt-api" = callPackage ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring - , constraints, constraints-extras, containers, data-default + , constraints-extras, containers, data-default, dependent-sum , jsaddle, reflex, reflex-dom-core, some, text, time }: mkDerivation { pname = "reflex-gadt-api"; - version = "0.2.1.0"; - sha256 = "1mcxa87z6cldbc9p2mkdif5a8qa8sa0nhmawwm1gjqgvhzp7kmdp"; + version = "0.2.2.0"; + sha256 = "1ras7jl1j90a4zd9bnw4x31ykk0ww373kjpkd9sq909i73a7xzxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-gadt-th base bytestring constraints constraints-extras - containers data-default jsaddle reflex reflex-dom-core some text - time + aeson aeson-gadt-th base bytestring constraints-extras containers + data-default jsaddle reflex reflex-dom-core some text time ]; executableHaskellDepends = [ - aeson aeson-gadt-th base constraints-extras reflex-dom-core text - time + aeson aeson-gadt-th base constraints-extras dependent-sum + reflex-dom-core text time ]; description = "Interact with a GADT API in your reflex-dom application"; license = lib.licenses.bsd3; @@ -237338,8 +238301,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "1"; - editedCabalFile = "1j7wcw3f8fmd0m1iqndliw2w4jrm4rr7lyydn3xi7wxyvy8a0kmf"; + revision = "2"; + editedCabalFile = "19ryjv8va9bjwhfk4v81lsvi91aj7aw1cflggywjpmw001qr419d"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -238174,6 +239137,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "rel8_1_4_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , case-insensitive, comonad, containers, contravariant, hasql + , hasql-transaction, hedgehog, mmorph, opaleye, pretty + , product-profunctors, profunctors, scientific, semialign + , semigroupoids, tasty, tasty-hedgehog, text, these, time + , tmp-postgres, transformers, uuid + }: + mkDerivation { + pname = "rel8"; + version = "1.4.0.0"; + sha256 = "1i0ah0wqx0z7grm9zbvf6mx6gk7lx1xfa7svbp4dnb4k8p52b63k"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring case-insensitive comonad + contravariant hasql opaleye pretty product-profunctors profunctors + scientific semialign semigroupoids text these time uuid + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hasql hasql-transaction + hedgehog mmorph scientific tasty tasty-hedgehog text time + tmp-postgres transformers uuid + ]; + description = "Hey! Hey! Can u rel8?"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "relacion" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -239465,26 +240456,24 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "req_3_12_0" = callPackage + "req_3_13_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, exceptions, hspec - , hspec-core, hspec-discover, http-api-data, http-client + , bytestring, case-insensitive, connection, containers, exceptions + , hspec, hspec-core, hspec-discover, http-api-data, http-client , http-client-tls, http-types, modern-uri, monad-control, mtl , QuickCheck, retry, template-haskell, text, time, transformers , transformers-base, unliftio-core }: mkDerivation { pname = "req"; - version = "3.12.0"; - sha256 = "1gwdqmqmj3acim5r8c4sjzcvr3hvlbcjwkrpcsvq95ckr1wmzpqp"; - revision = "1"; - editedCabalFile = "0f3d1y1ymgrdbf84p4pgpbsn5772vc5lrjmj7wgf7baqw03kq8wy"; + version = "3.13.0"; + sha256 = "1igs75bj57vs1fwpxj1765l6zkqd4r3p2gbwp6cv2l37drfxjck4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection exceptions http-api-data http-client - http-client-tls http-types modern-uri monad-control mtl retry - template-haskell text time transformers transformers-base + case-insensitive connection containers exceptions http-api-data + http-client http-client-tls http-types modern-uri monad-control mtl + retry template-haskell text time transformers transformers-base unliftio-core ]; testHaskellDepends = [ @@ -239862,8 +240851,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; - revision = "4"; - editedCabalFile = "1d3dsbvrwynnbdj32fswiwh90h28p31h6fsfpq5zh85rd29yp210"; + revision = "5"; + editedCabalFile = "0df5y8bj9bxjmqnkvpwxvb17k70g1i174xs6vfrv9f1lys7xkqk1"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -240065,8 +241054,8 @@ self: { pname = "resourcet-effectful"; version = "1.0.0.0"; sha256 = "0446j4ihj3fn6lkqi2b1642ak27l6cpwfv4b73gpanq3nad69fzg"; - revision = "2"; - editedCabalFile = "1v02b2cp0cnfinr7bndxdwl84qqzz558rmf17xhskgl4iy2ziqvl"; + revision = "3"; + editedCabalFile = "1w3zij2aj3q06r2773d964pv20ix5n70hf15kawzsd6sadbwymz3"; libraryHaskellDepends = [ base effectful-core resourcet ]; description = "Adaptation of the resourcet library for the effectful ecosystem"; license = lib.licenses.bsd3; @@ -241979,8 +242968,8 @@ self: { pname = "rle"; version = "0.1.0.1"; sha256 = "05rbhm0lxrq7vdbq9s0q21m0f0hlzmknljmampcmdjnwbl4nvf3d"; - revision = "2"; - editedCabalFile = "1qrc7d5h9ikvk0mxk0q03x7iwbax11vw97416qqknl7m6azi915v"; + revision = "3"; + editedCabalFile = "1gl5igmac6qhfanfnr65i5g9y9cqpzrr429hkriqyp5xvsgg3qka"; libraryHaskellDepends = [ base cereal deepseq portray portray-diff wrapped ]; @@ -243575,8 +244564,8 @@ self: { pname = "rss"; version = "3000.2.0.7"; sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; - revision = "5"; - editedCabalFile = "197a9q8zmfx8imbnrwp7b62xahh2qs47mk67hzhrrz0f5v88qszm"; + revision = "6"; + editedCabalFile = "1zhkfkvlbisk5qa7fccpwknblzk1m4kyyfcdhj436p2q5kx8dd8v"; libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; @@ -244780,8 +245769,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "4"; - editedCabalFile = "0k7kivfkaqv9py5358pk76v6vf39s4hipmdxnwn6jq0kc7zr3ddc"; + revision = "5"; + editedCabalFile = "1qwzj9nija3kw6ijxl5nhny7vclp7x31cml3hl9fpajj5v0lhh4j"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -246958,8 +247947,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "2"; - editedCabalFile = "01vmr4pz1j0xjcln61m7gng6bzhgri56h05x7sl6xbxjps15likn"; + revision = "3"; + editedCabalFile = "1n67w1b64q59nn4845z3kr8rm0x0p7bi3cyp6n1dpnfs8k4l8x2i"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -248080,8 +249069,8 @@ self: { }: mkDerivation { pname = "sdl2-ttf"; - version = "2.1.2"; - sha256 = "0jg3dg4g876shbcxlgcjwfd0g76ih3xh8f1hc79qxg6j48khxbpd"; + version = "2.1.3"; + sha256 = "0sm5lrdif5wmz3iah1658zlr7yr45d1hfihb2hdxdia4h7z1j0mn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249018,8 +250007,8 @@ self: { pname = "semialign"; version = "1.2.0.1"; sha256 = "0ci1jpp37p1lzyjxc1bljd6zgg407qmkl9s36b50qjxf85q6j06r"; - revision = "2"; - editedCabalFile = "0dm51m0qa1mbwk66wzidws1vvv6xy54swjg58nkjhw76yys2mcia"; + revision = "3"; + editedCabalFile = "0dbcdnksik508i12arh3s6bis6779lx5f1df0jkc0bp797inhd7f"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -249055,6 +250044,8 @@ self: { pname = "semialign-indexed"; version = "1.2"; sha256 = "16f0y3j85zlq2f8z45z085dizvbx4ihppp1ww3swh5daj0zf3kzy"; + revision = "1"; + editedCabalFile = "041zf53szkshc13i0kqgk77rb7r00snknv5qhq2ka4vfg2f0dn4x"; libraryHaskellDepends = [ base lens semialign ]; doHaddock = false; description = "SemialignWithIndex, i.e. izipWith and ialignWith"; @@ -249067,8 +250058,8 @@ self: { pname = "semialign-optics"; version = "1.2"; sha256 = "04vh689mmnb5q77v6ifhg7xf7m2qh5x4i4804rm4biw78130xqr1"; - revision = "1"; - editedCabalFile = "1cvl6lprra947pdiy7x54qczsfq0383ncsxp4hvlkk9kif7w0pvm"; + revision = "2"; + editedCabalFile = "107qx6qxqyl3lbg59by9jbys39fc5mdbgph8iwxxklk3xr5v5nj1"; libraryHaskellDepends = [ base optics-core semialign ]; doHaddock = false; description = "SemialignWithIndex, i.e. izipWith and ialignWith"; @@ -249533,8 +250524,8 @@ self: { }: mkDerivation { pname = "seonbi"; - version = "0.3.1"; - sha256 = "11hbx3d0d3c08axbxa275rlsa6kgr7p4h6wdwvlpnwmp7h4sgasi"; + version = "0.3.2"; + sha256 = "1a0mh7fi0h04n56vdl5xh2p4ql813743x7y11zl06llrj5cvgggg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -250510,8 +251501,8 @@ self: { }: mkDerivation { pname = "servant-cassava"; - version = "0.10.1"; - sha256 = "0hf7v35yyfqxc20hgq755laba7lziz2vsy7y8cj8nhczcc67smq0"; + version = "0.10.2"; + sha256 = "1g2d6gvy21mfxl4f0slqxm7jrapqs47m9n615gijmb536i8csfq1"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -255149,6 +256140,8 @@ self: { pname = "shh"; version = "0.7.2.0"; sha256 = "0rcjvkpxdwvhgn7i1dindhbskr8kwgm977kxgi2xcv398c71014y"; + revision = "1"; + editedCabalFile = "054bjhpkni3nr6zsilj77gdgb2yw5s1gzm257zz4kigpjjjndr0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255354,8 +256347,8 @@ self: { pname = "short-vec"; version = "0.1.0.0"; sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "6"; - editedCabalFile = "13bi12zgv810vn5grqm6agw2v8sk9m0c5hivk34pv0sjiwhlk4m1"; + revision = "7"; + editedCabalFile = "02ycid229dkn3df7r0maib1qci268pyw005lmlsz7drw0isw2jh3"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -255386,8 +256379,8 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; - revision = "2"; - editedCabalFile = "18ic2kvvcyl9y69kg0jjlyqnw9xyj205clp2qfbl3k0sjlqb9va5"; + revision = "3"; + editedCabalFile = "0vk9nzhk7bipvd09ww7j79xxkjffddprhgdybd8ins8fg6rcxlxx"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; @@ -257694,8 +258687,8 @@ self: { pname = "sint"; version = "0.2.0"; sha256 = "108za6vamb75kd6s2m0iin1gk6b1azk11jzsj841r7j62rhjn1qx"; - revision = "1"; - editedCabalFile = "1pwb61jzmpwgg2a1lz30a1445hhasff73qy18jc765ahgimp1r50"; + revision = "2"; + editedCabalFile = "0asf2kgxx4xzhqksz9hnzivay961x6n013l3hhrmsr8krzjv0xh1"; libraryHaskellDepends = [ base portray portray-diff ]; testHaskellDepends = [ base portray portray-diff QuickCheck test-framework @@ -257812,6 +258805,8 @@ self: { pname = "sitemap-gen"; version = "0.1.0.0"; sha256 = "0dq87yix1ii6mna8qzbgrqn07ph41283bjzy40rpwm7aqdpv2z0z"; + revision = "1"; + editedCabalFile = "0wizn0h8vwjrfgznb4bikpvil37v9iy42ginq584k85kiysxxmqa"; libraryHaskellDepends = [ base text time xmlgen ]; testHaskellDepends = [ base bytestring HUnit raw-strings-qq tasty tasty-hunit time @@ -257898,10 +258893,8 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.3.0"; - sha256 = "17ph05bd3knx1bymbzxqziq86qpch66il7g2ipcybrbaaggy0cm7"; - revision = "1"; - editedCabalFile = "12scmfwyj1r92w3mdxvg28fxksizrv9f7g7qwqdg64bqpb1lwljd"; + version = "0.1.3.1"; + sha256 = "1x2z8iw4jgcp6xirclifjhh3rvyjy5xgqrd6lcv4gifj859sfjd2"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -258346,6 +259339,8 @@ self: { pname = "skylighting-core"; version = "0.13"; sha256 = "01j6v2dy04lsmrx98hvgpb6vnirs1h0gbiy7q5ck5q3k37cqys7p"; + revision = "1"; + editedCabalFile = "1kbwbkjgilr0m0hfiq94rlvk691wgrmlrbd916mkv5h869qdyjrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261530,6 +262525,8 @@ self: { pname = "snumber"; version = "0.3.0"; sha256 = "16kgy0chysxws8n4651qq6bfwyk184v67iv2h2kbiyxl8wqsjq4l"; + revision = "1"; + editedCabalFile = "1wsw6l2raqqfpvr7av2js9744w77mdjpb2k0k61lm33gpp01prwi"; libraryHaskellDepends = [ base numeric-kinds type-compare ]; description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; @@ -262068,6 +263065,8 @@ self: { pname = "some"; version = "1.0.4"; sha256 = "0x1qivqnayybxa6nbnaqyay73yfglxwb3xwfy03pb6ycs639avs4"; + revision = "1"; + editedCabalFile = "0hwq21d0y2iwcrkdhqkq76fna90dsdzrkk6ryh9hbg71lf768ih9"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -263609,10 +264608,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "split"; - version = "0.2.3.4"; - sha256 = "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7"; - revision = "2"; - editedCabalFile = "0jwaw5plby8bmjmhshrr5813avqmq4zih2lqpi8cprvfh0z9rpx6"; + version = "0.2.3.5"; + sha256 = "0n9ip49laq5jwqw0c43lhf69ii8y4lwci9j6d5bjnjim23bai2mz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; @@ -263684,6 +264681,8 @@ self: { pname = "splitmix"; version = "0.1.0.4"; sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; + revision = "1"; + editedCabalFile = "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -264915,6 +265914,8 @@ self: { pname = "stache"; version = "2.3.3"; sha256 = "1naqj54qm59f04x310lvj4fsrp3xar1v643i79gp7h48kyn1c2vy"; + revision = "1"; + editedCabalFile = "1dlnbmsz1grhwwca2k00601g2fqbq6hr9s1k1g4hhwj0j7ihc0h1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -267145,8 +268146,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.7"; - sha256 = "1sny6ippahlxhm94888lj19ar36cnjilbw2yza5p223mv0cgnapx"; + version = "1.2.0.8"; + sha256 = "1p3njvg5sixsgk12rldmvgcj8flmh00w968mzaavxl4j4axd8x3c"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -268107,6 +269108,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_3" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.3"; + sha256 = "026fr6415iaxw3fmjjmczs7fiqw8ckzd4vfpp2rh88ismz8j6s7l"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -269066,8 +270089,8 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.5"; - sha256 = "1n0rw1vvvsgznx4i21480qzzs44iw35hcdiw0d160war7nf2pyp5"; + version = "0.1.5.1"; + sha256 = "188wr0s94ypbdp2mdfnc6fx8fdzbmjjbkc0v23wsbidmw71x5wz3"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; @@ -269772,8 +270795,8 @@ self: { pname = "stripe-wreq"; version = "1.0.1.14"; sha256 = "01z0hqqnnc2g8q0bzj4brjmd9wmpjda4rlk770brvk9ip9mjdlys"; - revision = "1"; - editedCabalFile = "1knsmrj0m1xjf8z8hsjcci3h7bg5afzbnx5v6znffc5vzgnphc64"; + revision = "2"; + editedCabalFile = "1ijsspbd5in2jv1kcz78y0xxi09px60n51snfx9b49dsjnh2yniv"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text wreq ]; @@ -270245,26 +271268,38 @@ self: { "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec - , network-uri, QuickCheck, regex-tdfa, scientific, text - , unordered-containers + , network-uri, QuickCheck, regex-tdfa, scientific, stylist-traits + , text, unordered-containers }: mkDerivation { pname = "stylist"; - version = "2.4.0.2"; - sha256 = "02p1xm9m1l9qgn6dyi2kc2zlb7iixx7ikwg3vwq4pgszjmhisbi6"; + version = "2.5.0.0"; + sha256 = "0sna4q5sw7x5lz9nky5pdpznyq2rmxr82wwg7aigyydb63d8g700"; libraryHaskellDepends = [ - async base css-syntax hashable network-uri regex-tdfa text - unordered-containers + async base css-syntax hashable network-uri regex-tdfa + stylist-traits text unordered-containers ]; testHaskellDepends = [ async base css-syntax hashable hspec network-uri QuickCheck - regex-tdfa scientific text unordered-containers + regex-tdfa scientific stylist-traits text unordered-containers ]; description = "Apply CSS styles to a document tree"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; + "stylist-traits" = callPackage + ({ mkDerivation, base, css-syntax, network-uri, text }: + mkDerivation { + pname = "stylist-traits"; + version = "0.1.0.0"; + sha256 = "17wzhd7xfbj16sa3v5zhg4h1g0czccnv3ksbx7mi56dbf6lqq5bi"; + libraryHaskellDepends = [ base css-syntax network-uri text ]; + description = "Traits, datatypes, & parsers for Haskell Stylist"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -270445,8 +271480,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "sublists"; - version = "0.1.1.0"; - sha256 = "1k08cpidl5r4sj64vc1a9fcln78k31z7v8gnh579fxa5lrp4ylnr"; + version = "0.1.2.0"; + sha256 = "07z5ihlvhv3symbn69zzln30bdl9cyf2wp22vxrlf4010a895w28"; libraryHaskellDepends = [ base ]; description = "Allows to split lists into sublists with some patterns by quantity"; license = lib.licenses.mit; @@ -275500,9 +276535,10 @@ self: { ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; - version = "0.3.1"; - sha256 = "1gbqknfh7xc4hb2g58rjh66ibpwp4i38pizkzknx4n366d2292hy"; + version = "0.3.2"; + sha256 = "0j92ggsg3fqwkq9zgx94wqqi11yim4b7d1b2s1s24rdv6wy3sfn8"; libraryHaskellDepends = [ base containers deepseq tasty ]; + benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; }) {}; @@ -275514,8 +276550,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.3.0"; - sha256 = "0vlhpc50w8gzdix1ys42cgpdv8rnkffal2zn283pccf1lfbimbjk"; + version = "1.0.4.0"; + sha256 = "1zfmd6q4z7gw2i1avcxkgqwjkwh0gzzfmrh6czwc57qnvnaaki4x"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; @@ -275808,6 +276844,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.1"; sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; + revision = "1"; + editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -277580,8 +278618,8 @@ self: { pname = "ten"; version = "0.1.0.2"; sha256 = "0djvcb2l9dnnjbhivchi6yyaj5i96jmy7yhr9x3paiz1l54brrqx"; - revision = "2"; - editedCabalFile = "1ps9l5v5gg0bj2mxwplhi267p94wk5jdcpsv3g106aczw16l5nwz"; + revision = "3"; + editedCabalFile = "10ip8dcilycknr64nfhgki30xr73m19jbmv66dpslflkbrkx8ig3"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive hashable portray portray-diff some text transformers wrapped @@ -277601,8 +278639,8 @@ self: { pname = "ten-lens"; version = "0.1.0.1"; sha256 = "0qckywzj1c1k8la2ya1vpgrpl9fnqhggx6m6ad0rgrhyal48522c"; - revision = "1"; - editedCabalFile = "1hb0kgp80nbj5smxxsg9iw12r3lpci1z4ddwiv2cznw3qkkl4qa3"; + revision = "2"; + editedCabalFile = "05ak4fscx8xs1y216qzcdi743z6vmpvgvcdlasidixdjww562mkr"; libraryHaskellDepends = [ base lens profunctors some ten ]; description = "Lenses for the types in the ten package"; license = lib.licenses.asl20; @@ -277618,6 +278656,8 @@ self: { pname = "ten-unordered-containers"; version = "0.1.0.3"; sha256 = "1kfww8xs5m802jcx309pp6lx9f7pn1hsbqq3mln4g9rcf0r24mwy"; + revision = "1"; + editedCabalFile = "051w5krkb6yyn9c28b3csvpikc6i02dypnkx4hmyylvan7bfdz6r"; libraryHaskellDepends = [ base hashable portray portray-diff some ten unordered-containers wrapped @@ -277904,6 +278944,8 @@ self: { pname = "tensors"; version = "0.1.5"; sha256 = "181jiffwp3varv9xzb8if22lwwi1vhhgqf7hai373vn2yavk5wal"; + revision = "1"; + editedCabalFile = "1mq51vajlj15356f3hjqxwq0q4lk9dpv0xpsk26wfzf7y55l4d3p"; libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ base deepseq hspec QuickCheck reflection vector @@ -278857,10 +279899,8 @@ self: { }: mkDerivation { pname = "testing-feat"; - version = "1.1.1.0"; - sha256 = "092m24z25anl70s1zq72z4rw7jwach9wdcgrs1qf749cdw9d89z5"; - revision = "1"; - editedCabalFile = "06cw21m4c22bix2xz726mkg6ic1kmrd8bhfbh4j8rv4f5g5k5skf"; + version = "1.1.1.1"; + sha256 = "14d6licgrkiw36xj1cshnqxcbx5iwzxwq731xlb1wb5n2sw8ijf2"; libraryHaskellDepends = [ base QuickCheck size-based testing-type-modifiers ]; @@ -279161,8 +280201,8 @@ self: { pname = "text-ansi"; version = "0.1.1"; sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6"; - revision = "3"; - editedCabalFile = "0xv9j3fyygaixmv14i3yds63nmvfqwfnz7883by61lvhq5dl3iyv"; + revision = "4"; + editedCabalFile = "0x7d9fgh2mvr0phb20s76k5wl6pl59r667jhkaqfbf88xz44j04k"; libraryHaskellDepends = [ base text ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -279686,6 +280726,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; + revision = "1"; + editedCabalFile = "1wq3dg7i1ydhvib2pzwj7w2cskvl8l7m8j0ln6s8bibn2ryzcm3p"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -279920,6 +280962,8 @@ self: { pname = "text-short"; version = "0.1.5"; sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; + revision = "1"; + editedCabalFile = "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -280805,6 +281849,8 @@ self: { pname = "th-lift-instances"; version = "0.1.19"; sha256 = "0rk0q609q8pha4wqxxhrr221nc9lc9wanif3qm1g8lav51500pd8"; + revision = "1"; + editedCabalFile = "18kdwjsrb4hjs1127w0106q0rqs14iliykx51692h5jn50q5j7mj"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -281201,8 +282247,8 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; - revision = "5"; - editedCabalFile = "0jk8cyxlvwfxg3j3cxixs36rnlswgwcwq86agx2kvmzyp1kffsgh"; + revision = "6"; + editedCabalFile = "12ll5l8m482qkb8zn79vx51bqlwc89fgixf8jv33a32b4qzc3499"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -281214,8 +282260,8 @@ self: { pname = "these-lens"; version = "1.0.1.2"; sha256 = "1v3kj7j4bkywbmdbblwqs5gsj5s23d59sb3s27jf3bwdzf9d21p6"; - revision = "1"; - editedCabalFile = "0rpcbl8j61qmdhsyq8nf7as29w156iq09q5clz51vmxbl1j2ggqp"; + revision = "2"; + editedCabalFile = "1mncy6mcwqxy4fwibrsfc3jcx183wfjfvfvbj030y86pfihvbwg3"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; @@ -281227,6 +282273,8 @@ self: { pname = "these-optics"; version = "1.0.1.2"; sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; + revision = "1"; + editedCabalFile = "02xvfk8n40k6r595g8khcnxy1z2jhi2lfmfpi7m0ayrq7il0rls5"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; @@ -281610,8 +282658,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; - revision = "5"; - editedCabalFile = "0034dl1mzzdi22c589qn5hb1k77vb97d54v3cgim4av42n8r76d1"; + revision = "7"; + editedCabalFile = "0lf7w1kxnd0wwqwrq2svbki1cbzwl9ggvfl1bvxvhg1qrw0avqbd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -282040,25 +283088,21 @@ self: { mainProgram = "tidal"; }) {}; - "tidal_1_8_0" = callPackage - ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, exceptions, hint, hosc, microspec - , mtl, network, parsec, primitive, random, text, transformers - , weigh + "tidal_1_8_1" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, exceptions, hosc, microspec, mtl + , network, parsec, primitive, random, text, transformers, weigh }: mkDerivation { pname = "tidal"; - version = "1.8.0"; - sha256 = "19gh5l8hna9s4k5qw98qcr1s9wpqi6mf2kxd4kz6lzl3yxj56y6z"; - isLibrary = true; - isExecutable = true; + version = "1.8.1"; + sha256 = "00000haj9y3ss95dhphq2pq0xs2qagg76ra4lir5kg3pv71i2dh9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq exceptions hosc mtl network parsec primitive random text transformers ]; - executableHaskellDepends = [ async base exceptions hint ]; testHaskellDepends = [ base containers deepseq hosc microspec parsec ]; @@ -282066,7 +283110,6 @@ self: { description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - mainProgram = "tidal"; }) {}; "tidal-link" = callPackage @@ -282340,8 +283383,8 @@ self: { pname = "time-compat"; version = "1.9.6.1"; sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; - revision = "3"; - editedCabalFile = "1lafp8yk2n8g873ivi36gnwd8syhw5lssm3xj4c1fplnivhg5n22"; + revision = "4"; + editedCabalFile = "1n39yfk21xz8y1xvkh01651yysk2zp5qac22l5pq2hi7scczmxaw"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -283992,8 +285035,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.5.0.1"; - sha256 = "11mh34jirabrdx9jbai42r0pgbx2q2v6028zigjznvhrsc7lkk4l"; + version = "0.5.1.2"; + sha256 = "0fisalws4qz4y3dagmra4mxns6b5ljf3szf907kdf34v4lysf8j0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -284009,31 +285052,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_5_1_1" = callPackage - ({ mkDerivation, async, base, bytestring, connection, data-default - , hspec, http-client, http-client-tls, http-types, mtl, network - , process, req, text, unliftio, wai, warp, warp-tls - }: - mkDerivation { - pname = "tmp-proc"; - version = "0.5.1.1"; - sha256 = "1z1pk3c5d021hy2jpcfg246ydvk62k6x5103qjis4rl82s6yy89y"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - async base bytestring mtl network process text unliftio wai warp - warp-tls - ]; - testHaskellDepends = [ - base bytestring connection data-default hspec http-client - http-client-tls http-types req text wai warp warp-tls - ]; - description = "Run 'tmp' processes in integration tests"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "tmp-proc-example" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, hedis, hspec , hspec-tmp-proc, http-client, http-client-tls, monad-logger, mtl @@ -284044,8 +285062,8 @@ self: { }: mkDerivation { pname = "tmp-proc-example"; - version = "0.5.1.1"; - sha256 = "1ilvyj511yh2hk3blaqbk7djchidfbrpgqckh7563k1kx7i6vkn0"; + version = "0.5.1.2"; + sha256 = "1dfvb85n3ivikfm91i33g4l96rdndrhqxad18h3nfk9g05x9af1d"; libraryHaskellDepends = [ aeson base bytestring exceptions hedis hspec hspec-tmp-proc http-client http-client-tls monad-logger mtl persistent @@ -284066,8 +285084,8 @@ self: { }: mkDerivation { pname = "tmp-proc-postgres"; - version = "0.5.1.1"; - sha256 = "0nwcxzny8xkbq5lpd6mf0dhr45s26ysyg7saa2zdbvf8d7a79hlh"; + version = "0.5.2.1"; + sha256 = "0vd8ag23brrbcgfsjpi5cg0fm5crlww8mmg2cpiyqhih370qivxr"; libraryHaskellDepends = [ base bytestring postgresql-simple text tmp-proc ]; @@ -284087,8 +285105,8 @@ self: { }: mkDerivation { pname = "tmp-proc-rabbitmq"; - version = "0.5.1.1"; - sha256 = "0fp412v2n2sgysr17ih591xn8cip6v86kdvgqbpsw4bcasbw154d"; + version = "0.5.1.2"; + sha256 = "1kysd1li7qaczdiqxbcmhxjq97h6xkjcyz0qhkwfy424x1dd6m3d"; libraryHaskellDepends = [ amqp base bytestring text tmp-proc ]; testHaskellDepends = [ amqp base bytestring hspec hspec-tmp-proc text tmp-proc @@ -284105,8 +285123,8 @@ self: { }: mkDerivation { pname = "tmp-proc-redis"; - version = "0.5.1.1"; - sha256 = "0wx734zdxbr3674254d440dvf78nd2ckscy0n6gkkal9xggs92cz"; + version = "0.5.1.2"; + sha256 = "1602z1sx9gl0ca3wfq48k1rnxl93fb99zp6m49mbyd8l2gfijf5c"; libraryHaskellDepends = [ base bytestring hedis text tmp-proc ]; testHaskellDepends = [ base bytestring hedis hspec hspec-tmp-proc text tmp-proc @@ -284123,8 +285141,8 @@ self: { }: mkDerivation { pname = "tmp-proc-zipkin"; - version = "0.5.1.1"; - sha256 = "1gy09qpvlzqdpcbnz2dq3dira6s9d3ndshch2fw7raxyk9dzrnmf"; + version = "0.5.1.2"; + sha256 = "1sjdrd53vh8mfc7gk04lzzqjcgaif4pb20vsd52cfh5210iagb92"; libraryHaskellDepends = [ base bytestring http-client text tmp-proc tracing ]; @@ -284576,6 +285594,8 @@ self: { pname = "tomato-rubato-openal"; version = "0.1.0.4"; sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1"; + revision = "1"; + editedCabalFile = "06ad3qq1ix448ikyx1jxav9da8mszay0vdhsq4vf855jrwx7finy"; libraryHaskellDepends = [ base OpenAL stm vector ]; description = "Easy to use library for audio programming"; license = lib.licenses.bsd3; @@ -287874,8 +288894,8 @@ self: { ({ mkDerivation, base, ghc-prim, hspec, template-haskell }: mkDerivation { pname = "tuple-append"; - version = "0.1.1.0"; - sha256 = "00qj8rhnga8d18ylw7hjsizijh9qzdm50n4czrx941np5vn1lff2"; + version = "0.1.2.0"; + sha256 = "0fiq5v8y5plzw1rmsv7hh951fnz45r714p38nrql940pp7qyh9rj"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim hspec ]; description = "A package to append items and tuples into new tuples"; @@ -288279,6 +289299,8 @@ self: { pname = "twee-lib"; version = "2.4.1"; sha256 = "14pvmxq0dp8lwbmkvch4c6v4rblc8a2ybkm7q3hhr1qaj2pyiv0b"; + revision = "1"; + editedCabalFile = "1d9z1ggiw23snn35nhbkj0rh2abha2ca1csr49x5a7lxc974mzc7"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive random transformers uglymemo vector @@ -289110,8 +290132,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "3"; - editedCabalFile = "1jxr46yiah7i3jmdqclf8bvk3apmm6g8hpij7dv6ca6h7alk8fmv"; + revision = "4"; + editedCabalFile = "0sajw67mmk5syhbrwx4bz82j5cjhm04n4kjl0pp3dnphxg1m5nbw"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -289535,6 +290557,8 @@ self: { pname = "type-safe-avl"; version = "1.0.0.1"; sha256 = "0s7qkm6hk5qf0a54jmk3dv1cfzivc4c0jbx7gn20w5pfmv08zj1c"; + revision = "1"; + editedCabalFile = "0xcamv7cy7saywzx2vj7d0l1hpjqkz8jzkdy8hdabz7q9zlynshg"; libraryHaskellDepends = [ base ]; description = "Type safe BST and AVL trees"; license = lib.licenses.gpl3Only; @@ -290426,6 +291450,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; + revision = "1"; + editedCabalFile = "0mwal38qsf32fppza1ivx0vdvpma9z5gn4ni08mc080ns0s7kvgy"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -290449,8 +291475,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.2.20220315.0"; - sha256 = "1x5lkbd0n0h0nyxr3a3ib1lxp1d862g805wkn2p92ry4pmj1yacb"; + version = "0.2.20220810.0"; + sha256 = "0jayyhljnwz7ax4qc7ywlkpsqfm4qkfkbkyl9yc89s6pqnhdg4jd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -290462,6 +291488,26 @@ self: { license = lib.licenses.asl20; }) {}; + "tzdata_0_2_20220815_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , tasty, tasty-hunit, tasty-th, unix, vector + }: + mkDerivation { + pname = "tzdata"; + version = "0.2.20220815.0"; + sha256 = "0ya7hmq93mmfbiwwsf628b27mahkv525fyjh8r1mg9zwf6pkrhrd"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq vector + ]; + testHaskellDepends = [ + base bytestring HUnit tasty tasty-hunit tasty-th unix + ]; + description = "Time zone database (as files and as a module)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -290937,8 +291983,8 @@ self: { }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.5.3.0"; - sha256 = "181cm83hl2ga3gg0fa8kflrn2fnxmmdxx7flijr3c7pj8xd04l18"; + version = "0.6.0.0"; + sha256 = "1n6blzjbqkvhnwlzjkn0xs8vnlv7n419ska09zd1r59jv15623ac"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ukrainian-phonetics-common ]; @@ -290952,8 +291998,8 @@ self: { }: mkDerivation { pname = "ukrainian-phonetics-basic-array-bytestring"; - version = "0.1.0.0"; - sha256 = "1xg3hfxmjvnj3x7ippjwypggi9c052fcalnvrljr6s8fyrmya7sx"; + version = "0.1.1.0"; + sha256 = "11pdyvxl34ckprp19r1akpzbsl3jknz4cn4jmlfm6d9vzr9lwbzl"; libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ukrainian-phonetics-common ]; @@ -292589,8 +293635,8 @@ self: { pname = "universe-base"; version = "1.1.3"; sha256 = "0lnvjpndqj7kk3f95dmpa62ax0m243h8iy7ghcsd2db4nyczx7f5"; - revision = "2"; - editedCabalFile = "1fr7w3qc46aph0xxya8jw1a4gqzvq03f6vpx75pam9ynfndz8gw0"; + revision = "3"; + editedCabalFile = "0hnd5vxsncwyjsindfmsvp9jbixanhmzczhrmd8s8g6imgb0mzyk"; libraryHaskellDepends = [ base containers ghc-prim tagged transformers ]; @@ -292605,8 +293651,8 @@ self: { pname = "universe-dependent-sum"; version = "1.3"; sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5"; - revision = "1"; - editedCabalFile = "1d300h7587cry0xdhrlg9sz34z2il94r5xxqxxp17r62xc98alwl"; + revision = "2"; + editedCabalFile = "05spqm8sc40gpd0d68xal85h8ihhf0ys02clvjmn9ayb7rajssj3"; libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; @@ -292636,6 +293682,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.3"; sha256 = "02fxra5g76dk2jpbvmj0mj5bylj4400fcp3np3s5d31qgsjh2sn6"; + revision = "1"; + editedCabalFile = "0jkrfx0r5j5azaknlbkn7xskyyfjisifddvlpwirfzzmm068yk9g"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -292664,8 +293712,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1.1"; sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4"; - revision = "1"; - editedCabalFile = "16g0iffwy1xb5qnrbqvg0ypjx4q2124g2a80i36ynkzknhggkqnx"; + revision = "2"; + editedCabalFile = "1mp9222337rdcc6x5kg6hm14npbmq2igg0h6gmyvn1jd4x5cg9dx"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = lib.licenses.bsd3; @@ -292679,8 +293727,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "2"; - editedCabalFile = "0haz8fprwxx22jg4394p7a6zll8jim2hcb1rjy366vslwlczr03z"; + revision = "3"; + editedCabalFile = "1caqfajnhja7cz3bbz9pg2m9l3yc128hvsp7d3rpjw86g3wx2x0j"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -293231,6 +294279,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; + revision = "1"; + editedCabalFile = "0fcax3apnpxxy9maymclr6s2b4c28d3pkl3plbg0lv1mn0mh84fv"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -295110,8 +296160,8 @@ self: { pname = "uuid-types"; version = "1.0.5"; sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; - revision = "2"; - editedCabalFile = "0x3limqb67l4i0lfdaqgqbjak7mi7ydk5dhkv80791r3hyhbhiw4"; + revision = "3"; + editedCabalFile = "10hpjshw6z8xnjpga47cazfdd4i27qvy4ash13lza2lmwf36k9ww"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random template-haskell text @@ -296009,8 +297059,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "1"; - editedCabalFile = "07b4ajdj0fi1qbf641qnql7vfd1aj6i554jxpy55xnr2laspsr6i"; + revision = "2"; + editedCabalFile = "1bjwv3nv8jfhrdxa5kn3gvgxmyalpq7592bvyl7bpvcc7bbkfkf3"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -296419,6 +297469,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; + revision = "1"; + editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans HUnit primitive QuickCheck random tasty @@ -296965,6 +298017,8 @@ self: { pname = "vector-stream"; version = "0.1.0.0"; sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; + revision = "1"; + editedCabalFile = "18sm3vd1qim9r3m40wgvnmcrfz1zl051yy84dffnp4si9vfgic09"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -296992,8 +298046,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "2"; - editedCabalFile = "088588xdqdm9y7r04l74fkckhrvmfhgsx6iv0wq36yff05dij630"; + revision = "3"; + editedCabalFile = "0ki133sixq8pkfys36nl25jzdvnw40qq2bnskdmk2zyjhckdjcna"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -299792,35 +300846,6 @@ self: { }) {}; "wai-middleware-delegate" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , bytestring-lexing, case-insensitive, conduit, conduit-extra - , connection, data-default, hspec, http-client, http-client-tls - , http-conduit, http-types, network, random, resourcet - , streaming-commons, text, vault, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "wai-middleware-delegate"; - version = "0.1.2.4"; - sha256 = "17r2qay83xnsg6f61bxpy7kvjw73827hdl8srxiwqirw6zzc1pha"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra data-default http-client http-conduit http-types - streaming-commons text wai wai-conduit - ]; - testHaskellDepends = [ - async base blaze-builder bytestring bytestring-lexing - case-insensitive conduit conduit-extra connection data-default - hspec http-client http-client-tls http-conduit http-types network - random resourcet text vault wai wai-conduit warp warp-tls - ]; - description = "WAI middleware that delegates handling of requests"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "wai-middleware-delegate_0_1_3_1" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , bytestring-lexing, case-insensitive, conduit, conduit-extra , connection, data-default, hspec, http-client, http-client-tls @@ -301087,6 +302112,8 @@ self: { pname = "warp-tls"; version = "3.3.2"; sha256 = "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m"; + revision = "1"; + editedCabalFile = "0r4g0j4kcz9rx776mp8hqd06k8b2k7kxd4qjavh2ay6wcplfl0bl"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls tls-session-manager unliftio wai warp @@ -301095,6 +302122,24 @@ self: { license = lib.licenses.mit; }) {}; + "warp-tls_3_3_3" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, unliftio + , wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.3.3"; + sha256 = "18397xyl1awb040m9qkjz44ifzgd00hib70v1lrkp1ivj1xbwi2w"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager unliftio wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 @@ -301459,6 +302504,7 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -302003,8 +303049,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.4.1.1"; - sha256 = "1zmw16fyx0p7wzl388f6s63r09f189c5a5py5c7phlc7wzlq02hb"; + version = "0.4.1.2"; + sha256 = "1xdqq80jcxzd0qvmsgrcpjkw4lpcsws2pin2v3v1gpf0qv0syi36"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -304824,8 +305870,8 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; - revision = "2"; - editedCabalFile = "1balrpfkhlwp7v4r74zdm3x7ckz605bj7z7l5gkyj96lk1l2b5kq"; + revision = "3"; + editedCabalFile = "1z7p0kx98yn3jwpghhs1360r4pvrg1vvj66p8w6npvbb5nv6z99j"; libraryHaskellDepends = [ base ]; description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; @@ -304837,8 +305883,8 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.1"; sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; - revision = "2"; - editedCabalFile = "1pyggg9n3i08w4fzbm463012fjm1wdi0bh5nik667y5dhzvqi2li"; + revision = "3"; + editedCabalFile = "0hax0aq1sbjhmr62y9wf04k9c0zd3vj1drk3dkmlvbxmnxhdix87"; libraryHaskellDepends = [ base data-default-class wrapped ]; description = "A Generic instance of Default"; license = lib.licenses.asl20; @@ -306729,18 +307775,16 @@ self: { }) {}; "xml-conduit-stylist" = callPackage - ({ mkDerivation, base, containers, css-syntax, network-uri, stylist - , text, unordered-containers, xml-conduit + ({ mkDerivation, base, containers, css-syntax, network-uri + , stylist-traits, text, xml-conduit }: mkDerivation { pname = "xml-conduit-stylist"; - version = "2.3.0.0"; - sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w"; - revision = "2"; - editedCabalFile = "16hky6q4v5zmxyarj464i5hlq7s4c9b3vb7skxn2yi66vfy03a32"; + version = "3.0.0.0"; + sha256 = "1w6sg2xj7l912qlqjy3lljwd5clbsakxqkp8jg8v5537h4nkfa9r"; libraryHaskellDepends = [ - base containers css-syntax network-uri stylist text - unordered-containers xml-conduit + base containers css-syntax network-uri stylist-traits text + xml-conduit ]; description = "Bridge between xml-conduit/html-conduit and stylist"; license = lib.licenses.mit; @@ -306940,6 +307984,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; + revision = "1"; + editedCabalFile = "0ga90h55aw3f946xk1x2ailnwinw3v4icw9xirgncgf3lajwxl4f"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -307515,8 +308561,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.44.1"; - sha256 = "1msgbxmv83g4zn5srnr7b5m9qk962pc24w62k83m7316yv9p0xa2"; + version = "0.44.2"; + sha256 = "0gdphjn5ll5lkb2psdsb34563wsz6g0y2gg3z8cj4jy8lvbbv808"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -307864,6 +308910,8 @@ self: { pname = "xor"; version = "0.0.1.1"; sha256 = "05jwfrg4cm27ldj3dbl0y144njhiha9yiypirbhsg6lc1b36s3kh"; + revision = "1"; + editedCabalFile = "0ppy515y2y1bviaafx6hg440ain0l6j5pg4g5j7lwjzsknxb0jd5"; libraryHaskellDepends = [ base bytestring ghc-byteorder ]; testHaskellDepends = [ base bytestring ghc-byteorder QuickCheck tasty tasty-hunit @@ -308952,8 +310000,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.11"; - sha256 = "1znca5my1z2pjgnw4x37lmh0lqipbg4xkw7lsijjn4ddhazwpd7x"; + version = "0.1.0.12"; + sha256 = "0wca4xqww3y1cvf6jshdk13nblg7byzyw7120yy8b2bgd3d0l42z"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -310106,8 +311154,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.0.1"; - sha256 = "0kajlm8hyq52gda8hff302jlij4a8j56082zr5224lggrnkrcbwm"; + version = "0.7.0.2"; + sha256 = "1dnpw1rl8pa7dwfiy203l54x1rrzaiib7ryha9yy2vyaljlymg4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9bbfe4419286..9d7cbe6f8f1b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -565,7 +565,13 @@ in package-set { inherit pkgs lib callPackage; } self // { pkgs.runCommandLocal name { inherit src; - nativeBuildInputs = [ buildHaskellPackages.cabal-install ]; + nativeBuildInputs = [ + buildHaskellPackages.cabal-install + + # TODO after https://github.com/haskell/cabal/issues/8352 + # remove ghc + self.ghc + ]; dontUnpack = false; } '' unpackPhase diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 68a1a0f267ad..da20fa7a6606 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -3,7 +3,7 @@ symlinkJoin { inherit (idris-no-deps) name src meta; paths = [ idris-no-deps ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/idris \ --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \ diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 080cbe2778a6..55bfd8c15750 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -10,7 +10,7 @@ lib.appendToName "with-packages" (symlinkJoin { paths = paths ++ [idris] ; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/idris \ diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 380e983ab6f5..b7ad4e4ec727 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -61,13 +61,11 @@ builder rec { libunistring ]; - # According to Bernhard M. Wiedemann on - # #reproducible-builds on irc.oftc.net, (2020-01-29): they had to build - # Guile without parallel builds to make it reproducible. - # - # re: https://issues.guix.gnu.org/issue/20272 - # re: https://build.opensuse.org/request/show/732638 - enableParallelBuilding = false; + # According to + # https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/guile.scm?h=a39207f7afd977e4e4299c6f0bb34bcb6d153818#n405 + # starting with Guile 3.0.8, parallel builds can be done + # bit-reproducibly as long as we're not cross-compiling + enableParallelBuilding = stdenv.buildPlatform == stdenv.hostPlatform; patches = [ ./eai_system.patch diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 718f13ad2e7d..ec182705a37a 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-scc29tS3jiGacHp90tGmn/qnbLscJ4sAOCm8IteXfh4="; + sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0="; }; # This release fails the test suite on darwin, remove when debugged. diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 2431199beaaf..ada99e525c81 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -37,7 +37,7 @@ buildRebar3 { inherit src version; - buildInputs = [ erlang makeWrapper ]; + nativeBuildInputs = [ makeWrapper erlang ]; beamDeps = [ proper ]; patches = [ ./fix-rebar-config.patch ./dedup-ebins.patch ] ++ patches; doCheck = true; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 96a715cbbc7c..da4df0fb79a2 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f"; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ flex bison unzip makeWrapper ]; buildInputs = [ - flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices + ncurses buddy tecla gmpxx libsigsegv cln yices ]; hardeningDisable = [ "stackprotector" ] ++ diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix index 88b1302271fb..fae94dbf08d2 100644 --- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -19,7 +19,7 @@ let in buildEnv { name = "aspell-env"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ aspell ] ++ dicts; postBuild = '' # Construct wrappers in /bin diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 2c70c3e8acba..9045944ad193 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-f1STZdxj8cdK60dCgl2Xfsqaa/x3Z1xEjH3p4GUwGUg="; + sha256 = "sha256-Wi1vW0EYgtOltPI5FMhY5je2ZMF9R5ch4nIjENva+FU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b20371f5dd29..421f7001ab18 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.7.0"; + version = "0.7.4"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DKorZUVUDEP4IRPchzaW35fPLmYoJRcfLMdPHrBrol8="; + sha256 = "sha256-9k+/yvvQmq/aX4c3vmfZNtKD1PuYo27IUoNUQw0Adgc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 24cb52d61a67..64b91ca3a1df 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.7"; + version = "0.2.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Du9Ib3MhPcgetBIi0k1NboaXxZh7iPNhDe7197JnHc="; + sha256 = "sha256-I4DqsPmHsZsReoqAH0WMU5/XlM4LiaxpJrVVYdXnMZY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 86ab4f4230e6..110d0e661391 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.15"; + version = "0.6.19"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-WIKWF8G+fdX9MD6vQctM+5pDnR0/0TenabWE4PRteq8="; + sha256 = "sha256-ErwsRYz0D5ktlDaXIDvTXkxO7MM0N4RAA5IBqPbNfAc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 0a9bb5543735..3365d0e32505 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LIrAA3+Yd0lhCMQ9R4HT/ZFKm3y9iSm3h5vcn0ghiPA="; + sha256 = "sha256-HMsCFvwWgWwU3YBuZsmOSsMnEvzAVV9jEZyEEBwRcYg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 6700b4e6a13e..c77f1f1b92d6 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.10"; + version = "0.7.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I="; + sha256 = "sha256-+vxn9Fq8eZ53cRR31hnLf1cxZ2zY03lt2RuEop+ciu0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 881bec9c2805..9d1706bff0a9 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.39"; + version = "0.1.43"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-UbYh3awI7Y3mJnVQrltU+rZ1TI1TDaMF5TOcvxbzNa8="; + sha256 = "sha256-I4pPNjaRNHPzVZVgY0qm8S+Tdvtklx/N3EKu0SAm5c8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 28bb15f2a745..763fa027b9bb 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , aws-c-auth , aws-c-cal , aws-c-common @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.28"; + version = "0.17.32"; outputs = [ "out" "dev" ]; @@ -25,22 +24,13 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-4/BgwX8Pa5D2lEn0Dh3JlUiYUtA9u0rWpBixqmv1X/A="; + sha256 = "sha256-Za2+7stcdrKou8DlfIIYGu5RYqS2FG5zCITm9pFSWX0="; }; patches = [ # Correct include path for split outputs. # https://github.com/awslabs/aws-crt-cpp/pull/325 ./0001-build-Make-includedir-properly-overrideable.patch - - # Fix build with new input stream api - # https://github.com/awslabs/aws-crt-cpp/pull/341 - # Remove with next release - (fetchpatch { - url = "https://github.com/awslabs/aws-crt-cpp/commit/8adb8490fd4f1d1fe65aad01b0a7dda0e52ac596.patch"; - excludes = [ "crt/*" ]; - sha256 = "190v8rlj6z0qllih6w3kqmdvqjifj66hc4bchsgr3gpfv18vpzid"; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 889c03676c10..f399291f0799 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -32,14 +32,14 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; version = if stdenv.system == "i686-linux" then "1.9.150" - else "1.9.238"; + else "1.9.294"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY=" - else "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; + else "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; }; postPatch = '' diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index d8804d10bad5..a09d95798920 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.94"; + version = "0.1.96"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tqiyj1XgwX9QMft5Wecv/g+/gZbRlorW78mNG0ksO74="; + sha256 = "sha256-M2c/5Fmpg/QRJFpJ+B/X8ZZq8eqOypsJWpQMVCuFRfY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f085f33827c3..bd179c6ee739 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.04"; + version = "22.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-2XQpwPNWjK5FF9ex5QxrGEPsUXT/MBqjXy7P2D/SxZw="; + sha256 = "sha256-ZGyLP7dsVDKPCGA/6MNSEifd1rOcYqLdcEXYIQxrgtE="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 42e7c665f2b2..86ef77ee5ee8 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-0bJ0n/5yzj6lHXLKJzHUS0Bnlmys+X7pY/3LGapVh6k="; + sha256 = "sha256-tIM6CdIPq++xFbpA22zDm3D4dT9soNDe/9GRY/FyLrw="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 0ef5dfbc2e57..8e3afb1e5c38 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.08.15.00"; + version = "2022.08.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-GJYjilN2nwKEpuWj2NJQ25hT9lI2pdkWzgfLBph5mmU="; + sha256 = "sha256-Cj8JK3uoObt1G8kd2y4KxS88WwLPthdBvPcLi1C24aQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix index a4738e4b6a73..9b31a2213ceb 100644 --- a/pkgs/development/libraries/gsignond/wrapper.nix +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ gsignond ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/gsignond \ diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix index 268acb2f948d..9d2732c44096 100644 --- a/pkgs/development/libraries/libisds/default.nix +++ b/pkgs/development/libraries/libisds/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libisds"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz"; - sha256 = "1n1vl05p78fksv6dm926rngd3wag41gyfbq76ajzcmq08j32y7y1"; + sha256 = "sha256-YUb4N7J7EaYHHiFI965kUhtNitRTJfmY/ns3MTfkGPs="; }; configureFlags = [ diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 36f1a288f1a5..6496d1acff06 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl }: stdenv.mkDerivation rec { - version = "2.0.1"; + version = "2.6.1"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-/1J9cs0W96CtnHAoX/jg3FLGD9coa0eOEgf8uMQHuUk="; + sha256 = "sha256-S+RvD7sXn8yjGAHv1OqiJJMAA45r8N1Rhz89d8yGv1Q="; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 23c1f2cc3457..f8c3834e7d8d 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "2.6.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-6Xe9zT0qLLGe1+QCQ9NALoDTaRhHpaTLbCbA+kV7hOA="; + sha256 = "sha256-Rn3KKYW5OBInZYaDhwYVyPvL3UiuRG8CyHtPvW1S0Zo="; }; buildInputs = [ zlib openssl libre ]; makeFlags = [ diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c5cd5c353960..f9e8ae22923e 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: +{ lib +, stdenv +, fetchurl +, pkg-config +, cmake +, zlib +, openssl +, libsodium + +# for passthru.tests +, ffmpeg +, sshping +, wireshark +}: stdenv.mkDerivation rec { pname = "libssh"; @@ -21,6 +34,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + passthru.tests = { + inherit ffmpeg sshping wireshark; + }; + meta = with lib; { description = "SSH client library"; homepage = "https://libssh.org"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index adc9409ddf5c..28b9ff50251d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -58,23 +58,23 @@ , util-linux ? null # Darwin -, gmp ? null -, libiconv ? null -, Carbon ? null -, AppKit ? null +, gmp +, libiconv +, Carbon +, AppKit # Options , enableCeph ? false -, ceph ? null +, ceph , enableGlusterfs ? false -, glusterfs ? null +, glusterfs , enableIscsi ? false -, openiscsi ? null -, libiscsi ? null +, openiscsi +, libiscsi , enableXen ? false -, xen ? null +, xen , enableZfs ? stdenv.isLinux -, zfs ? null +, zfs }: with lib; @@ -354,10 +354,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://libvirt.org/"; - description = '' - A toolkit to interact with the virtualization capabilities of recent - versions of Linux (and other OSes) - ''; + description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz globin lovesegfault ]; diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix index d0064947c929..7ddf4fa5f178 100644 --- a/pkgs/development/libraries/lzlib/default.nix +++ b/pkgs/development/libraries/lzlib/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; doCheck = true; + configureFlags = [ "--enable-shared" ]; + meta = with lib; { homepage = "https://www.nongnu.org/lzip/${pname}.html"; description = diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index ca46d203b348..991d2e661f14 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-Yf3cVFdI8vR/qcxghcx8fsbYs1qD8r6O5aqZ0AkSLDc="; + sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index f2ea86160fb6..09f0d05dd59d 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-Faex1NF5bJa0GdC+Sz4p6kHaGUtAkqZlNGi0TSc5ckw="; + hash = "sha256-chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index 212019bb0e16..d80a5f79d6ad 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "rinutils"; - version = "0.10.0"; + version = "0.10.1"; meta = with lib; { homepage = "https://github.com/shlomif/rinutils"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cNifCoRk+PSU8zcEt8k5bn/KOS6Kr6pEZXEMGjiemAY="; + sha256 = "sha256-MewljOmd57u+efMzjOcwSNrEVCUEXrK9DWvZLRuLmvs="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2e3f9dec3194..219c06ce57ad 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Gp9JkRUDoi9WgXzILqm4f7fnRntf+YnKWqYcEufVMtk="; + sha256 = "sha256-YGt8ev9zc0zwM+zRVvQFKfpXkvVFJJUqKJOMoIkNeSQ="; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 265e09f436ab..01ec5e4b9b5d 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -37,7 +37,7 @@ final: prev: let rec { fileVersion = "10.0"; fullVersion = "7.4.2.24"; - sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; + hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-10.0-linux-x64-v${fullVersion}.tgz"; supportedCudaVersions = [ "10.0" ]; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 731b5588f887..773d130ba735 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -21,13 +21,10 @@ { fullVersion , url -, hash ? null -, sha256 ? null +, hash , supportedCudaVersions ? [ ] }: -assert (hash != null) || (sha256 != null); - assert useCudatoolkitRunfile || (libcublas != null); let @@ -46,7 +43,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - inherit url hash sha256; + inherit url hash; }; # Check and normalize Runpath against DT_NEEDED using autoPatchelf. diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 8e5d71801158..6718262c2a38 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -23,6 +23,13 @@ , enableAVX512 ? false , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic + +# for passthru.tests +, ceres-solver +, giac +, octave +, opencv +, python3 }: with lib; @@ -225,6 +232,11 @@ EOF ln -s $out/lib/libopenblas.a $out/lib/liblapacke.a ''; + passthru.tests = { + inherit (python3.pkgs) numpy scipy; + inherit ceres-solver giac octave opencv; + }; + meta = with lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index bbf65879d169..2b4b1d5767b1 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -45,7 +45,7 @@ let withPlugins = plugins: let vapoursynthWithPlugins = vapoursynth.withPlugins plugins; in runCommand "${unwrapped.name}-with-plugins" { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; } '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index e7663009c59d..ae5582f4d3be 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -4,35 +4,41 @@ , wrapQtAppsHook , cmake , qtbase +, qtsvg , qttools -, nix-update-script +, testers +, zint }: stdenv.mkDerivation rec { pname = "zint"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { - owner = "woo-j"; + owner = "zint"; repo = "zint"; rev = version; - sha256 = "sha256-DtfyXBBEDcltGUAutHl/ksRTTYmS7Ll9kjfgD7NmBbA="; + sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ qtbase qtsvg qttools ]; + + cmakeFlags = [ "-DZINT_QT6:BOOL=ON" ]; postInstall = '' - install -Dm644 $src/zint-qt.desktop $out/share/applications/zint-qt.desktop - install -Dm644 $src/zint-qt.png $out/share/pixmaps/zint-qt.png - install -Dm644 $src/frontend_qt/images/scalable/zint-qt.svg $out/share/icons/hicolor/scalable/apps/zint-qt.svg + install -Dm644 -t $out/share/applications $src/zint-qt.desktop + install -Dm644 -t $out/share/pixmaps $src/zint-qt.png + install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/frontend_qt/images/scalable/zint-qt.svg ''; - passthru.updateScript = nix-update-script { - attrPath = pname; + passthru.tests.version = testers.testVersion { + package = zint; + command = "zint --version"; + inherit version; }; meta = with lib; { @@ -43,8 +49,8 @@ stdenv.mkDerivation rec { GUI, a CLI command line executable and a library with an API to allow developers access to the capabilities of Zint. ''; - homepage = "http://www.zint.org.uk"; - changelog = "https://github.com/woo-j/zint/blob/${version}/ChangeLog"; + homepage = "https://www.zint.org.uk"; + changelog = "https://github.com/zint/zint/blob/${version}/ChangeLog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; }; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 82c08b46bc8b..e67b8ee336ed 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.15"; + version = "1.2.16"; pname = "zlog"; src = fetchFromGitHub { owner = "HardySimpson"; repo = pname; rev = version; - sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; + sha256 = "sha256-wpaMbFKSwTIFe3p65pMJ6Pf2qKp1uYZCyyinGU4AxrQ="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-43521.patch"; - url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch"; - sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8="; - }) - ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { @@ -29,5 +21,4 @@ stdenv.mkDerivation rec { mainProgram = "zlog-chk-conf"; platforms = platforms.unix; }; - } diff --git a/pkgs/development/lisp-modules-new/packages.nix b/pkgs/development/lisp-modules-new/packages.nix index e858fa40288a..0a6520df5372 100644 --- a/pkgs/development/lisp-modules-new/packages.nix +++ b/pkgs/development/lisp-modules-new/packages.nix @@ -309,9 +309,8 @@ let sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"; }; + nativeBuildInputs = [ pkgs.makeWrapper ]; buildInputs = [ - pkgs.makeWrapper - # needed for GSETTINGS_SCHEMAS_PATH pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3 diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/development/misc/umr/default.nix index 3dba51022d3c..b83cb91a91b5 100644 --- a/pkgs/development/misc/umr/default.nix +++ b/pkgs/development/misc/umr/default.nix @@ -1,25 +1,28 @@ { lib, stdenv, fetchgit, bash-completion, cmake, pkg-config -, libdrm, libpciaccess, llvmPackages, ncurses +, json_c, libdrm, libpciaccess, llvmPackages, nanomsg, ncurses, SDL2 }: stdenv.mkDerivation rec { pname = "umr"; - version = "unstable-2021-02-18"; + version = "unstable-2022-08-23"; src = fetchgit { url = "https://gitlab.freedesktop.org/tomstdenis/umr"; - rev = "79e17f8f2807ed707fc1be369d0aad536f6dbc97"; - sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY="; + rev = "87f814b1ffdbac8bfddd8529d344a7901cd7e112"; + hash = "sha256-U1VP1AicSGWzBwzz99i7+3awATZocw5jaqtAxuRNaBE="; }; nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; buildInputs = [ bash-completion + json_c libdrm libpciaccess llvmPackages.llvm + nanomsg ncurses + SDL2 ]; # Remove static libraries (there are no dynamic libraries in there) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index da2c3f31a45e..1f1316d8fb6b 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -2,8 +2,9 @@ deployAndroidPackage { inherit package os; - buildInputs = [ makeWrapper ] ++ - lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 94a76078c477..f68d51c75c3f 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -2,9 +2,9 @@ deployAndroidPackage { inherit package os; - buildInputs = [ makeWrapper ] - ++ lib.optionals (os == "linux") (with pkgs; [ - autoPatchelfHook + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optionals (os == "linux") (with pkgs; [ glibc libcxx libGL diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix index 5ce21a2fee3e..28ea249df25c 100644 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -2,8 +2,8 @@ deployAndroidPackage { name = "androidsdk"; - buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; inherit package os; patchInstructions = '' diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index 361e02661f37..2f4f88a75975 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -3,9 +3,10 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; - buildInputs = [ makeWrapper ] - ++ lib.optional (os == "linux") ( - (with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib]) + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") ( + (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) ++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) ); diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d865ca9a50d1..2a117c6bc614 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -44,6 +44,7 @@ , "btc-rpc-explorer" , "castnow" , "carbon-now-cli" +, "carto" , "cdk8s-cli" , "cdktf-cli" , "clean-css-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d2c32e0ed4a4..a1dc64b30b4b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -166,40 +166,40 @@ let sha512 = "S+u0KjglyI3jEZWwIuBvFjEwY3Zk5lCWfhet+95sFKJEjEYgF4Fuk8Mau/9cr55hIcpZqTQUvyxnS/VDoj4WLg=="; }; }; - "@antora/asciidoc-loader-3.0.3" = { + "@antora/asciidoc-loader-3.1.0" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.3.tgz"; - sha512 = "pr6fyYCkvaSlfh6zW9kBFdzCAZnHIo3JZmEa6r6amrCz5SVV+DYjThnC5pn0V1AqHCL4ZGoRxb+7YlT4093jDg=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.0.tgz"; + sha512 = "7eGSfMkyXp8k8pJkCRvlednsYI2YSnkoynEoYYSUgpAsXV7lAwuLxURg67CnpMrJjQwQdgS1QzfgJXay/rdnhg=="; }; }; - "@antora/content-aggregator-3.0.3" = { + "@antora/content-aggregator-3.1.0" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.3.tgz"; - sha512 = "j1XBDoN58o/FmxTvauw5ndtrScOq2uozkgDMpigdFoplGL79HKwHQcxCMSLOaatJNb1Y9xtfH22ZfqRPb7SCbw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.1.0.tgz"; + sha512 = "5NF9fpWTBbArpPnF+vL2uB2PjmqOcUg24Zj9WOopSw/vy/gknG4xCjzbEU08wWAIYaJotR8VrvpieeGkszIdDw=="; }; }; - "@antora/content-classifier-3.0.3" = { + "@antora/content-classifier-3.1.0" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.3.tgz"; - sha512 = "F7lerJl1ijb6ZDqErHRNgT71Q4aQff4syIqYI248yAxuyfS+EnIQHJlT6lvomXO7AFnAKWjFqqtTI7rfW6LdLA=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.1.0.tgz"; + sha512 = "FF4QVb0EHRaZNcQu6HYti+0kAs5AhxuxLhUpixFC2SL+YMa0YovCs7vMp6Bl4iTQUW+DLMxznxTZ+HL/q4cTEg=="; }; }; - "@antora/document-converter-3.0.3" = { + "@antora/document-converter-3.1.0" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.3.tgz"; - sha512 = "U/+ygiqLFWCEM5CYCaY5oFQyKM0dfJpKM9gLzWjP33tqGvzqcDe2Jqtr4UUh+U81BHM6ffC+TAEkMyLpunCecw=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.1.0.tgz"; + sha512 = "UXkfzy0UTD2GKW7vWRyLbHkUFltgVu/S6FsLMrxb64qVPu4YzTBGt0ZVA4phK5GglqpQ2Q1smbiDp1iXOgcq+g=="; }; }; "@antora/expand-path-helper-2.0.0" = { @@ -211,94 +211,94 @@ let sha512 = "CSMBGC+tI21VS2kGW3PV7T2kQTM5eT3f2GTPVLttwaNYbNxDve08en/huzszHJfxo11CcEs26Ostr0F2c1QqeA=="; }; }; - "@antora/file-publisher-3.0.3" = { + "@antora/file-publisher-3.1.0" = { name = "_at_antora_slash_file-publisher"; packageName = "@antora/file-publisher"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.0.3.tgz"; - sha512 = "EB15WaWYjTNDbc5Vff+jK1Lt8YqbQXOnt5c57TslFnIJylyTU9dd/BRaMw8jVMP60FKaLgQ0OSo3X2tjJQy9Ww=="; + url = "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.1.0.tgz"; + sha512 = "X6O9B1dn0yXzUrK0+Xe4BCjhA0t4Ackj3fmCOjG26f6ziuzKpXdpCkUGwXUqe/oCaQW1/LvSf1aMPM0UdN+GDQ=="; }; }; - "@antora/logger-3.0.3" = { + "@antora/logger-3.1.0" = { name = "_at_antora_slash_logger"; packageName = "@antora/logger"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/logger/-/logger-3.0.3.tgz"; - sha512 = "68oZfE1C02HJ8lEoBX0P0n3F5UYhOtKBJlRq0AXzWAORyUXCe25KmWjYKpneEqypCms8n7L/6e7nwATEY6hZIQ=="; + url = "https://registry.npmjs.org/@antora/logger/-/logger-3.1.0.tgz"; + sha512 = "JbYxulCg44mPy9djlWx41rF0ZfY3DUzdihSNMMbE0NrVIaQIWXCEUn02Rp6BL4xwLbJ6hQ0+TsEPRWdjMH5++Q=="; }; }; - "@antora/navigation-builder-3.0.3" = { + "@antora/navigation-builder-3.1.0" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.3.tgz"; - sha512 = "HMXjD3EKnze5bbLRFtJPwGYIVJpqTOpt01BCDKMmDUnm53uGgHXy3Ca4vtZBYAwhIfxsMKLxBtObSDO4d0RqHQ=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.1.0.tgz"; + sha512 = "zVbHQwBzMoRgLLwB9FVHvL/Gqhv8mQWECiSdHm2m0ruSK1r5VzpUilDtRfbKcriXe6ABNDxDRLzowQDDGsXtJQ=="; }; }; - "@antora/page-composer-3.0.3" = { + "@antora/page-composer-3.1.0" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.3.tgz"; - sha512 = "2zJEQjFrAbOqkVt2qDVyTnw6d/bZrp/yHUmqwUoN7wqG7uPkd/Q0+/Fdfj7loQ4qtKtw9Qy3xtva04vavlkxmw=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.1.0.tgz"; + sha512 = "Fvs8hytwKqAgUngUROSUz7AdOc4QsLmY8dCH6hXeEz3GVllDgnifsJWJbRlxCGNR0CPUZyMwqstJ6n9o8hUZqw=="; }; }; - "@antora/playbook-builder-3.0.3" = { + "@antora/playbook-builder-3.1.0" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.0.3.tgz"; - sha512 = "LTXYCSlLfzEPSkI7dXv5vSHnGx+fvY8uu1v/p3fNgqDOtLonJUfibMtLwE93AuHTkCNJeO5MmGzp8RURmGgYlw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.1.0.tgz"; + sha512 = "z+MMYDSnKLq4qoOljYILBv5jXv2ZKkdpzg2areSloKw6JCTgVKiBWqwOjFbE3wbd2KwvGaAT27Un8DVhfCArIQ=="; }; }; - "@antora/redirect-producer-3.0.3" = { + "@antora/redirect-producer-3.1.0" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.3.tgz"; - sha512 = "xugXc8t4WCdqLRovnFj1Kfzk/MVTGM/pYaveICh4Xnx37anOlYfgE4/mrUN9OXopXZ1hno3Tgajd4xar9ENELA=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.1.0.tgz"; + sha512 = "wEp+ZYkPm6+fyUM3bXd5RtfG4N2n3ksdxzydef4bDis8djDE4syGYhiT+N+nk9/myx4oeYNE8aMX46t+ViwrIw=="; }; }; - "@antora/site-generator-3.0.3" = { + "@antora/site-generator-3.1.0" = { name = "_at_antora_slash_site-generator"; packageName = "@antora/site-generator"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.0.3.tgz"; - sha512 = "yFnx2Vskq2inOZR0he8cu49b8UPfrv6FKB7uBvID5NbKxTO0XV51TemOxdnD/jePpFbpAOPp9PhCQl6Tb4R46g=="; + url = "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.1.0.tgz"; + sha512 = "XPH3G10vC0Y+ueQAdBzYCsx27N1Hg7YHU2oaBdPFDa07Gxf8hCJEntZlTExiKEzCzksFWqsgRh7WFpgbwcPHxg=="; }; }; - "@antora/site-mapper-3.0.3" = { + "@antora/site-mapper-3.1.0" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.3.tgz"; - sha512 = "h/qazt3LpB2PauYPudFpedGf4jk+Yj9FqKqiy05YH0ah660r+L3IDlZS3WT9UpKWdsYotobhVU6IRgCzlorRjg=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.1.0.tgz"; + sha512 = "7hWuRvSRdPuEMjUFlkeoyXvsaUX7aM3cIC8DgAuSa0g7Xm8bxicpL6+ud6H9feeYvMRKXPBTeea0lgskbdOJxA=="; }; }; - "@antora/site-publisher-3.0.3" = { + "@antora/site-publisher-3.1.0" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.3.tgz"; - sha512 = "bxtTzrZ1DeleGl9uJ/T+DFosr1moHOsg0j37hzkoc4f6/jaPj6O1z9by2i7rE3tdvtaxXe0o7hBiZ4qM+f37Kg=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.1.0.tgz"; + sha512 = "eMINxmLIF1QPU8Ctfqj8WKG7l/+vi4MmaYRBoSQylg4BjjIroZOfyPFBGwPv3SvXr4Rjh2lZSMHahs4j6wkLmw=="; }; }; - "@antora/ui-loader-3.0.3" = { + "@antora/ui-loader-3.1.0" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.3.tgz"; - sha512 = "uoSoi4HcEVu+5M94+QE0fGOECtEj3GjeEIIsdSVOp1UZeI1urn3M7YHxQ/MBhXKwihMZjmajvrRL0XKnRp0IFw=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.1.0.tgz"; + sha512 = "ofL1UEGIQyzR8JpxQYrHkvCkMSpJsG5ksVma/KDh0EDIL9cq/I39R4vZsGOByxEU8+NuJMmL2c9/GiGUxJsL4w=="; }; }; "@antora/user-require-helper-2.0.0" = { @@ -1336,22 +1336,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.18.8" = { + "@babel/compat-data-7.18.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.18.8"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; - sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz"; + sha512 = "5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw=="; }; }; - "@babel/core-7.18.10" = { + "@babel/core-7.18.13" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.10"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz"; - sha512 = "JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz"; + sha512 = "ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A=="; }; }; "@babel/core-7.9.0" = { @@ -1363,13 +1363,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.18.12" = { + "@babel/generator-7.18.13" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.12"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz"; - sha512 = "dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz"; + sha512 = "CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ=="; }; }; "@babel/generator-7.18.2" = { @@ -1408,13 +1408,13 @@ let sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.9" = { + "@babel/helper-create-class-features-plugin-7.18.13" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.9"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; - sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz"; + sha512 = "hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA=="; }; }; "@babel/helper-create-regexp-features-plugin-7.18.6" = { @@ -1624,13 +1624,13 @@ let sha512 = "VbqzK6QXfQVi4Bpk6J7XqHXKFNbG2j3rdIdx68+/14GDU7jXDOSyUU/cwqCM1fDwCdxp37pNV/ToSCXsNChcyA=="; }; }; - "@babel/parser-7.18.11" = { + "@babel/parser-7.18.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.11"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"; - sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"; + sha512 = "dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="; }; }; "@babel/parser-7.18.4" = { @@ -2029,13 +2029,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.9" = { + "@babel/plugin-transform-destructuring-7.18.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.9"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"; - sha512 = "p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; + sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -2434,22 +2434,22 @@ let sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.18.11" = { + "@babel/traverse-7.18.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.11"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz"; - sha512 = "TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz"; + sha512 = "N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA=="; }; }; - "@babel/types-7.18.10" = { + "@babel/types-7.18.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.10"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz"; - sha512 = "MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz"; + sha512 = "ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ=="; }; }; "@babel/types-7.18.4" = { @@ -2470,13 +2470,13 @@ let sha512 = "OeQJedtUpJierCR2wueifrLqWb3c7K78XE/2achGvk0GJT4eOedHbS3PlaBJTc7oTpaNdGMazAM3WhCbiHVmtA=="; }; }; - "@blueprintjs/core-4.8.0" = { + "@blueprintjs/core-4.9.0" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-4.8.0.tgz"; - sha512 = "dfs5i15V2eXwjW8dFblTcaFxqbQSUFP1Ua7WfyeraHwGix9IaEcNJDVxZoyyup2WJizeZ2FOnJ/ICKj0q1YC+w=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-4.9.0.tgz"; + sha512 = "PZKTrZtZjIAnYXM5YnZTSkQkegNiERn6pjDso99KnkekmId29D7fLr2Syml0p9+l5T5cyZzoq8ydGpQ1/tloHw=="; }; }; "@blueprintjs/icons-4.4.1" = { @@ -3955,22 +3955,22 @@ let sha512 = "puklLc6Jvg279OGagqkSfuHML6ckBhw3gJakdvIZHKeJiduh+34U4Finl3K24yBSXzG2WsN+LwLTd1Vcociy+g=="; }; }; - "@fluentui/font-icons-mdl2-8.4.8" = { + "@fluentui/font-icons-mdl2-8.4.9" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.4.8"; + version = "8.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.8.tgz"; - sha512 = "BVbXK/UBa/JfnOBj2atAvz8fzjvRsLJHyO0x8Z8VFgv0YZ2J1+2kv4ijw+nV6obg45bPNDH4PaN/HPgECz9FQA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.9.tgz"; + sha512 = "ZPwdeD2pCOTYD/iKwjZ/PjWGlGVi9chDfz59eyBhYTw2PgL2FcTEGohnHt8pv/9eGS2CoZr70QE+EhWxRhNfUw=="; }; }; - "@fluentui/foundation-legacy-8.2.15" = { + "@fluentui/foundation-legacy-8.2.16" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.15"; + version = "8.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.15.tgz"; - sha512 = "OLwCsTF5krheALJn+9ZYtciyRjlVExcuY7NpW/3mvOWeXZTPw22yIFQ2vP2QFvpctV/+Q1LtGcaGrt/afshr3Q=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.16.tgz"; + sha512 = "IDoWMj0dKO6FMlusfELc4iqomuu5hmUy++MMH+j8NqaFRt+b6IUqCxVx1ZFlDJ5ftgsyOdCRzIBMN+8jCXhfvw=="; }; }; "@fluentui/keyboard-key-0.4.2" = { @@ -3991,31 +3991,31 @@ let sha512 = "bHWftN3zTp1bbBfmAEH8YK9UURWj2mffw7b7VaW2Og1qxwv3GMSza1cyv/d3EVqpMJ8AVwFv3mbi9p1ieMN9mw=="; }; }; - "@fluentui/react-8.90.1" = { + "@fluentui/react-8.90.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.90.1"; + version = "8.90.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.90.1.tgz"; - sha512 = "2yIkuDmUytMKJTRrI1wLBk0qkG1GlCfumjRddcx6fXX+ydffrNQ4NQqRp8Hl8Sk8Ag2WOpM3sFm0/UyCuIjyEQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.90.2.tgz"; + sha512 = "wGz7EXRvwbCQggDXq/uzLShjFsPMvuxjEk3aph91H6FMNV8IZEQXgGymVEiOtQVPL3lwnnDC+ji7c/CX1kSHWw=="; }; }; - "@fluentui/react-focus-8.8.0" = { + "@fluentui/react-focus-8.8.1" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.0.tgz"; - sha512 = "TzTIMfD1ESCYIgx6dKGokYEWeCMB5xRDyo2F4MeCcYhuwX2fYjrMhxyrA6nK2qrJa7nHYw0USZY4bKwDny1RkA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.1.tgz"; + sha512 = "R5EBJUG5PMy7o0SddUE3Qplvq9oOHMJdGk8Vb0U5kqGk0v76O6qLuYbRLESHpIE90Jmy3n6NMicEm2mODV6g7g=="; }; }; - "@fluentui/react-hooks-8.6.7" = { + "@fluentui/react-hooks-8.6.8" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.7"; + version = "8.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.7.tgz"; - sha512 = "lQ6TQZEAtKImSVCm87V2Was4HQud4uWWARzEiUO1pQkbwux912REGKyfRgsKC0ZBQDTV8siTCmsC2q103/Am0A=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.8.tgz"; + sha512 = "crJLgzoyYrgkk5Y7/+Qj1UI/WYQn4pBa2QrkjG1YVCwV1HK7pDqKE9Z3Ax8qplQ1HzVS26XAhT7gnBWAkPYfzQ=="; }; }; "@fluentui/react-portal-compat-context-9.0.1" = { @@ -4045,22 +4045,22 @@ let sha512 = "Vg20KZ0ufgWjxx6GFbqC5wiVxXZDUWgNT0r0By/Eyj4bUSb1jG6lmf5z1oY1dUX0YS6Cp5e6GnvbNdXg5E7orA=="; }; }; - "@fluentui/style-utilities-8.7.7" = { + "@fluentui/style-utilities-8.7.8" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.7.7"; + version = "8.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.7.tgz"; - sha512 = "5EcL3QQGDiAi8GJYAZINHlJU10UgVTSgAFR6sF6Jl4+dFr6xrr2+Z53783YiaIyO0bAx9Ljh3/XWuh1cHAe7Ww=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.8.tgz"; + sha512 = "SfSViBOVyWxydHtW4pPfNkAmU1KezPJ9BwVqCcvL7j8iGmpXuqxAtmv6oHvS29tlCoGUdvZaQw9N3rlbmyOADg=="; }; }; - "@fluentui/theme-2.6.12" = { + "@fluentui/theme-2.6.13" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.12"; + version = "2.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.12.tgz"; - sha512 = "tnv/XL39KI4LY83CgPeI8yvLEk4bHmeGTwPRH8BiGvKrwEJ1ics23LMQu+K03ltvvo8HDzomyoir+Nb6cD7lDA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.13.tgz"; + sha512 = "qTdRlNvnHWewXReE7nTq5DZz/4fyxSGwbf274xUrCGEoW/qnVJzklXZzHxZjUreyw6UUzx948IRMB8xDTnyEPA=="; }; }; "@fluentui/utilities-8.12.0" = { @@ -4531,15 +4531,6 @@ let sha512 = "eBM03pu9hd3VqDQG+kHahiG1x80RGkkqqRb1Pchcwqej/KkAH95gAvKs6laqaHCycYaPK+TKuNQnOz9UXYA8qw=="; }; }; - "@grpc/grpc-js-1.6.8" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.8.tgz"; - sha512 = "Nt5tufF/O5Q310kP0cDzxznWMZW58GCTZhUUiAQ9B0K0ANKNQ4Lj/K9XK0vZg+UBKq5/7z7+8mXHHfrcwoeFJQ=="; - }; - }; "@grpc/proto-loader-0.6.12" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4558,15 +4549,6 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.0" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.0.tgz"; - sha512 = "SGPZtVmqOvNfPFOA/nNPn+0Weqa5wubBgQ56+JgTbeLY2VezwtMjwPPFzh0kvQccwWT3a2TXT0ZGK/pJoOTk1A=="; - }; - }; "@grpc/proto-loader-0.7.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -6961,22 +6943,22 @@ let sha512 = "7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg=="; }; }; - "@nrwl/cli-14.5.8" = { + "@nrwl/cli-14.5.9" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "14.5.8"; + version = "14.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-14.5.8.tgz"; - sha512 = "XX2TguehE1dFlwd8xRBzJ6wq5+2KigTeUNXLHMFdz/48veKlrmGB7qv7uXIgpquyfJhcvOcN4r4Qncj6Nbrlow=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-14.5.9.tgz"; + sha512 = "03uPNFz6DwaPGNelxI/pG8PE9MUSmEtTVOHeohu7Plq5gSSAhFw9Yd1cyTGDFVh6+16bpsleXJmv2zgC/BvAiA=="; }; }; - "@nrwl/tao-14.5.8" = { + "@nrwl/tao-14.5.9" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "14.5.8"; + version = "14.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-14.5.8.tgz"; - sha512 = "tN8qX8wtLP1cuGPKxdaArjtJaHJIpfZ3J2OqkotdocxcvwbDdTvTQzhcLknNNUk/jqHer3YsBmcgyJW3VGbf4w=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-14.5.9.tgz"; + sha512 = "88+0wVoNUV5QuJRVPjrAxLrEBlr4RmMVo4Ak8EjwP0gJ+Go419ejBsb57x9p9BZeXga/JVYTZDGB5B/L0eFhcw=="; }; }; "@oclif/command-1.8.0" = { @@ -8536,24 +8518,6 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@purest/config-1.0.1" = { - name = "_at_purest_slash_config"; - packageName = "@purest/config"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@purest/config/-/config-1.0.1.tgz"; - sha512 = "cEG7U0X26a25SVrHsja5TohAfnkd0jjkjNu0bPX6cQdrSe16j/WeOuX1+TXbkDuZcirIDv7gjHSMe5vfCnW2og=="; - }; - }; - "@purest/providers-1.0.1" = { - name = "_at_purest_slash_providers"; - packageName = "@purest/providers"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@purest/providers/-/providers-1.0.1.tgz"; - sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; - }; - }; "@putdotio/api-client-8.32.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; @@ -8581,6 +8545,60 @@ let sha512 = "Wip/xsc5lw8vsBlmY2MO/gFLp3MvuZ2baBZjDeTjjndMgM0h5sxz7AZR62RDPGgstp8Np7JzjvVqVT7tpFZqsw=="; }; }; + "@redis/bloom-1.0.2" = { + name = "_at_redis_slash_bloom"; + packageName = "@redis/bloom"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz"; + sha512 = "EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw=="; + }; + }; + "@redis/client-1.2.0" = { + name = "_at_redis_slash_client"; + packageName = "@redis/client"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/client/-/client-1.2.0.tgz"; + sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; + }; + }; + "@redis/graph-1.0.1" = { + name = "_at_redis_slash_graph"; + packageName = "@redis/graph"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz"; + sha512 = "oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ=="; + }; + }; + "@redis/json-1.0.3" = { + name = "_at_redis_slash_json"; + packageName = "@redis/json"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz"; + sha512 = "4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q=="; + }; + }; + "@redis/search-1.0.6" = { + name = "_at_redis_slash_search"; + packageName = "@redis/search"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz"; + sha512 = "pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="; + }; + }; + "@redis/time-series-1.0.3" = { + name = "_at_redis_slash_time-series"; + packageName = "@redis/time-series"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz"; + sha512 = "OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA=="; + }; + }; "@redocly/ajv-8.6.5" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; @@ -8590,31 +8608,13 @@ let sha512 = "3P2TY/u4c6OBqkP+1cTH1iGAEv0O34PV3vV2Wnos/nNHu62OTrtC4zcaxttG0pHtPtn42StrhGq7SsiFgP4Bfw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.107" = { + "@redocly/openapi-core-1.0.0-beta.108" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.107"; + version = "1.0.0-beta.108"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.107.tgz"; - sha512 = "Hj/DQkPZiaa0L5s4Wu4mKYVkzjKccFudI350scUQ0wykNoXXaYf4Ny82UJdAH4JGfe7Uf5xRoNrpRmeMekj5Uw=="; - }; - }; - "@request/api-0.6.0" = { - name = "_at_request_slash_api"; - packageName = "@request/api"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@request/api/-/api-0.6.0.tgz"; - sha512 = "8V82isKYfLhSerVU1oof5TtYv3vimweF0PBqk313rJVcu7GPzX8B/qH1cTw2fMgjoo3smFbf91p3tS1CiOYczA=="; - }; - }; - "@request/interface-0.1.0" = { - name = "_at_request_slash_interface"; - packageName = "@request/interface"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@request/interface/-/interface-0.1.0.tgz"; - sha512 = "eU+ccrwfht1uqoYN/fpDnjYFHm7MJJDCkUbEZHvVTdUR6PqDvfNuYkhRIQ/peIm3Jzq94duZgX5l2yTEToXfbw=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.108.tgz"; + sha512 = "4Lq7KB+XiBvVzpaY/M0a8qog/Zr8kGrvJbRW2z7Sk2Zpc/m+8LTuZbRh15eMoneVc13M9qbHFIRh3PG18g3Tng=="; }; }; "@rollup/plugin-commonjs-20.0.0" = { @@ -9067,15 +9067,6 @@ let sha512 = "vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA=="; }; }; - "@stoplight/better-ajv-errors-1.0.1" = { - name = "_at_stoplight_slash_better-ajv-errors"; - packageName = "@stoplight/better-ajv-errors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/better-ajv-errors/-/better-ajv-errors-1.0.1.tgz"; - sha512 = "rgxT+ZMeZbYRiOLNk6Oy6e/Ig1iQKo0IL8v/Y9E/0FewzgtkGs/p5dMeUpIFZXWj3RZaEPmfL9yh0oUEmNXZjg=="; - }; - }; "@stoplight/better-ajv-errors-1.0.3" = { name = "_at_stoplight_slash_better-ajv-errors"; packageName = "@stoplight/better-ajv-errors"; @@ -9103,15 +9094,6 @@ let sha512 = "NwIVzanXRUy291J5BMkncCZRMG1Lx+aq+VidGQgfkJjgo8vh1Y/PSAz7fSU8gVGSZBCcqmOkMI7R4zw7DlfTwA=="; }; }; - "@stoplight/json-3.18.1" = { - name = "_at_stoplight_slash_json"; - packageName = "@stoplight/json"; - version = "3.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json/-/json-3.18.1.tgz"; - sha512 = "QmELAqBS8DC+8YuG7+OvDVP6RaUVi8bzN0KKW2UEcZg+0a1sqeeZgfW079AmJIZg8HEN7udAt4iozIB8Dm0t1Q=="; - }; - }; "@stoplight/json-3.20.1" = { name = "_at_stoplight_slash_json"; packageName = "@stoplight/json"; @@ -9184,13 +9166,13 @@ let sha512 = "BmTnQkkhG6E301ADUX7dhQtIIUT/WVRszRHy+90M5Bxk+4kod/6Gi8w7sWuQ5myDls3mLEMjYWUOKaUALuPvug=="; }; }; - "@stoplight/spectral-core-1.13.0" = { + "@stoplight/spectral-core-1.13.1" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.13.0.tgz"; - sha512 = "h++UIhdYK6bCZYHCK8byeyOq2tgAUbXdwdR3+Wy1O3PrJERdA9fyL0I3KQ595HylZRo7z1PUoSeyY6FMypWTBQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.13.1.tgz"; + sha512 = "0az1LZ/A7b6u8HESzBMv65syZXjsYhpQxvtQ2F9D50G7+AvvDsvQa3myk1J3lz4hY4dU1quW2xGgan9mE+XDhA=="; }; }; "@stoplight/spectral-formats-1.2.0" = { @@ -9211,13 +9193,13 @@ let sha512 = "UWeUrxc1pu45ZNYKtK3OloMpkUNTPqwpmjbGUn4oEnbqrLEYu/B2oOg66EtGcadOBEsdOb7f5vaPlhUNNrpEpQ=="; }; }; - "@stoplight/spectral-parsers-1.0.1" = { + "@stoplight/spectral-parsers-1.0.2" = { name = "_at_stoplight_slash_spectral-parsers"; packageName = "@stoplight/spectral-parsers"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-parsers/-/spectral-parsers-1.0.1.tgz"; - sha512 = "JGKlrTxhjUzIGo2FOCf8Qp0WKTWXedoRNPovqYPE8pAp08epqU8DzHwl/i46BGH5yfTmouKMZgBN/PV2+Cr5jw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-parsers/-/spectral-parsers-1.0.2.tgz"; + sha512 = "ZQXknJ+BM5Re4Opj4cgVlHgG2qyOk/wznKJq3Vf1qsBEg2CNzN0pJmSB0deRqW0kArqm44qpb8c+cz3F2rgMtw=="; }; }; "@stoplight/spectral-ref-resolver-1.0.1" = { @@ -9247,13 +9229,13 @@ let sha512 = "1TlJgNxIqlcafzrH6gsGpQQcVkFhndib5piMNXVg9xshJ42l2yC6A0AUAixUC+ODJ5098DR7SjIYBVKk+CTQSw=="; }; }; - "@stoplight/spectral-rulesets-1.11.2" = { + "@stoplight/spectral-rulesets-1.11.3" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.11.2.tgz"; - sha512 = "na8hMO/Ozt/6b8j8wAxkFNj5mAkHdUocvPRsqI0qGMh0s8HDMdZvqBlNXQANpCN+Jb5maFrbIWAO3YHOEaroCw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.11.3.tgz"; + sha512 = "prcJ1Dor2fxWZsHDaPIokiy3Ax/xS6iK2zAUqyx1hmzy2ZvmRUT7D7lhLMuueiug032+fmIeEPomAeQAJDnBow=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -9283,15 +9265,6 @@ let sha512 = "dwqYcDrGmEyUv5TWrDam5TGOxU72ufyQ7hnOIIDdmW5ezOwZaBFoR5XQ9AsH49w7wgvOqB2Bmo799pJPWnpCbg=="; }; }; - "@stoplight/types-13.2.0" = { - name = "_at_stoplight_slash_types"; - packageName = "@stoplight/types"; - version = "13.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/types/-/types-13.2.0.tgz"; - sha512 = "V3BRfzWEAcCpICGQh/WW2LX4rcB2KagQ7/msf0BDTCF5qpFMSwOxcjv25k1NUMVQSh3qwGfGoka/gYGA5m+NQA=="; - }; - }; "@stoplight/types-13.6.0" = { name = "_at_stoplight_slash_types"; packageName = "@stoplight/types"; @@ -9310,6 +9283,15 @@ let sha512 = "N086FU8pmSpjc5TvMBjmlTniZVh3OXzmEh6SYljSLiuv6aMxgjyjf13YrAlUqgu0b4b6pQ5zmkjrfo9i0SiLsw=="; }; }; + "@stoplight/yaml-4.2.3" = { + name = "_at_stoplight_slash_yaml"; + packageName = "@stoplight/yaml"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@stoplight/yaml/-/yaml-4.2.3.tgz"; + sha512 = "Mx01wjRAR9C7yLMUyYFTfbUf5DimEpHMkRDQ1PKLe9dfNILbgdxyrncsOXM3vCpsQ1Hfj4bPiGl+u4u6e9Akqw=="; + }; + }; "@stoplight/yaml-ast-parser-0.0.48" = { name = "_at_stoplight_slash_yaml-ast-parser"; packageName = "@stoplight/yaml-ast-parser"; @@ -9346,13 +9328,13 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc/helpers-0.4.7" = { + "@swc/helpers-0.4.9" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.4.7"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.7.tgz"; - sha512 = "jJKr/2JOivCQxb5Xpli3asedRLH34QgJ3G+7gm6CoCOwt/LDDX9g67OuxvjFOiYZfngWYB66ZbjU6cUNtQdavg=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.9.tgz"; + sha512 = "VQBBIInp9++WQaRsXbi05XwnH0qhNCJ99iMzdh5WmA9eXhXKNc4NnMB8GEOL1aaRju+E+vQA4rGYFM1jmb3BXA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10516,13 +10498,13 @@ let sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; }; }; - "@types/node-14.18.25" = { + "@types/node-14.18.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.25"; + version = "14.18.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.25.tgz"; - sha512 = "9pLfceRSrKIsv/MISN6RoFWTIzka36Uk2Uuf5a8cHyDYhEgl5Hm5dXoe621KULeBjt+cFsY18mILsWWtJeG80w=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz"; + sha512 = "0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA=="; }; }; "@types/node-15.14.9" = { @@ -10534,13 +10516,13 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.52" = { + "@types/node-16.11.54" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.52"; + version = "16.11.54"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.52.tgz"; - sha512 = "GnstYouCa9kbYokBCWEVrszJ1P2rGAQpKrqACHKuixkaT8XGu8nsqHvEUIGqDs5vwtsJ7LrYqnPDKRD1V+M39A=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.54.tgz"; + sha512 = "ryOpwe15+BtTUxKFfzABjaI/EtXLPBSBEW4B6D5ygWNcORLVKG/1/FC3WwAr5d7t6lCnlVPRsCY0NH680QT+Pg=="; }; }; "@types/node-16.11.6" = { @@ -10588,13 +10570,13 @@ let sha512 = "w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="; }; }; - "@types/node-18.6.3" = { + "@types/node-18.7.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.6.3"; + version = "18.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.6.3.tgz"; - sha512 = "6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.7.11.tgz"; + sha512 = "KZhFpSLlmK/sdocfSAjqPETTMd0ug6HIMIAwkwUpU79olnZdQtMxpQP+G1wDzCH7na+FltSIhbaZuKdwZ8RDrw=="; }; }; "@types/node-18.7.9" = { @@ -11254,13 +11236,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.33.1" = { + "@typescript-eslint/eslint-plugin-5.34.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz"; - sha512 = "S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.34.0.tgz"; + sha512 = "eRfPPcasO39iwjlUAMtjeueRGuIrW3TQ9WseIDl7i5UWuFbf83yYaU7YPs4j8+4CxUMIsj1k+4kV+E+G+6ypDQ=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -11281,13 +11263,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.33.1" = { + "@typescript-eslint/parser-5.34.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz"; - sha512 = "IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.34.0.tgz"; + sha512 = "SZ3NEnK4usd2CXkoV3jPa/vo1mWX1fqRyIVUQZR4As1vyp4fneknBNJj+OFtV8WAVgGf+rOHMSqQbs2Qn3nFZQ=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -11299,22 +11281,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.33.1" = { + "@typescript-eslint/scope-manager-5.34.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz"; - sha512 = "8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.34.0.tgz"; + sha512 = "HNvASMQlah5RsBW6L6c7IJ0vsm+8Sope/wu5sEAf7joJYWNb1LDbJipzmdhdUOnfrDFE6LR1j57x1EYVxrY4ow=="; }; }; - "@typescript-eslint/type-utils-5.33.1" = { + "@typescript-eslint/type-utils-5.34.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz"; - sha512 = "X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.34.0.tgz"; + sha512 = "Pxlno9bjsQ7hs1pdWRUv9aJijGYPYsHpwMeCQ/Inavhym3/XaKt1ZKAA8FIw4odTBfowBdZJDMxf2aavyMDkLg=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -11335,13 +11317,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.33.1" = { + "@typescript-eslint/types-5.34.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz"; - sha512 = "7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.34.0.tgz"; + sha512 = "49fm3xbbUPuzBIOcy2CDpYWqy/X7VBkxVN+DC21e0zIm3+61Z0NZi6J9mqPmSW1BDVk9FIOvuCFyUPjXz93sjA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -11362,22 +11344,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.33.1" = { + "@typescript-eslint/typescript-estree-5.34.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz"; - sha512 = "JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.34.0.tgz"; + sha512 = "mXHAqapJJDVzxauEkfJI96j3D10sd567LlqroyCeJaHnu42sDbjxotGb3XFtGPYKPD9IyLjhsoULML1oI3M86A=="; }; }; - "@typescript-eslint/utils-5.33.1" = { + "@typescript-eslint/utils-5.34.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz"; - sha512 = "uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.34.0.tgz"; + sha512 = "kWRYybU4Rn++7lm9yu8pbuydRyQsHRoBDIo11k7eqBWTldN4xUdVUMCsHBiE7aoEkFzrUEaZy3iH477vr4xHAQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -11398,13 +11380,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.33.1" = { + "@typescript-eslint/visitor-keys-5.34.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz"; - sha512 = "nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.34.0.tgz"; + sha512 = "O1moYjOSrab0a2fUvFpsJe0QHtvTC+cR+ovYpgKrAVXzqQyc74mv76TgY6z+aEtjQE2vgZux3CQVtGryqdcOAw=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -11452,13 +11434,13 @@ let sha512 = "aMChId8/dSGN5U5xRsrCCOcUYcQuYJYDXhdswCvO1owYhCise4hoXM79sf4clohnh9P/t9wgC3TgKG8jALMV1g=="; }; }; - "@vercel/next-3.1.19" = { + "@vercel/next-3.1.20" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.1.19"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.1.19.tgz"; - sha512 = "ht1cEK4XbLvGUTpsLElJRXmb0SCT1eURIlO7/KdSlpsrsB+FLvijc35OtezVVFvxNKgIMByYgm5G5mXfYgOpOQ=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.1.20.tgz"; + sha512 = "zOZ0qVob3vQZXtLOEZ/Wr1C3imVbUir1J+HAUW6fMpHdJdxxHDi5IgGQkbjeAePox5Kp0pGzxCDubPcbQOmGcg=="; }; }; "@vercel/nft-0.21.0" = { @@ -11488,13 +11470,13 @@ let sha512 = "TNQK6cufwrhd8ASDk5YHHenH8Xhp9sY8xUjOTKnQQI37KLk+Sw2HlHhT5rzUFN23ahosUlkY8InwtYUmSNb9kw=="; }; }; - "@vercel/python-3.1.9" = { + "@vercel/python-3.1.10" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.9.tgz"; - sha512 = "3pCIsozPG0lciZTa1RBZSVlCa83+WBVvYEZ31FUn+nRNy67/qFl+RZnO61wZQYncn4HJxQ9r80FAmRZu1hfYVA=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.10.tgz"; + sha512 = "peBRG9ET2MC3fjuy2E++AGtCjgb8GGN00rptkNCN3dD3pydyhh+GKSuE5l+R8Fp8WBXBMwtJRa83MjJT3goeHQ=="; }; }; "@vercel/redwood-1.0.18" = { @@ -11686,13 +11668,13 @@ let sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ=="; }; }; - "@vue/compiler-sfc-2.7.9" = { + "@vue/compiler-sfc-2.7.10" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.9"; + version = "2.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.9.tgz"; - sha512 = "TD2FvT0fPUezw5RVP4tfwTZnKHP0QjeEUb39y7tORvOJQTjbOuHJEk4GPHUPsRaTeQ8rjuKjntyrYcEIx+ODxg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; + sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -14215,15 +14197,6 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "args-5.0.3" = { - name = "args"; - packageName = "args"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-5.0.3.tgz"; - sha512 = "h6k/zfFgusnv3i5TU08KQkVKuCPBtL/PWQbWkHUxvJrZ2nAyeaUupneemcrgn1xmqxPQsPIzwkUhOpoqPDRZuA=="; - }; - }; "argsarray-0.0.1" = { name = "argsarray"; packageName = "argsarray"; @@ -15484,13 +15457,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1199.0" = { + "aws-sdk-2.1200.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1199.0"; + version = "2.1200.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1199.0.tgz"; - sha512 = "N51EMTCMsiVAJDSKCDTMUheLBlPZ7/c/qyCMGirdoF64/JU+gvZ/u+UqkYPhK7XE80b0GqTj676rtp9OkU1kyg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1200.0.tgz"; + sha512 = "rS16H3j40ba2ZDFNxEdC5qzJ09gpQM0f71rYw47IAOlAycvOkCCAIL/6FqCPRWevmL5X/bkULvM+OG7s31oPrg=="; }; }; "aws-sign2-0.6.0" = { @@ -18779,15 +18752,6 @@ let sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="; }; }; - "camelcase-5.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; - sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="; - }; - }; "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; @@ -18878,13 +18842,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001381" = { + "caniuse-lite-1.0.30001382" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001381"; + version = "1.0.30001382"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001381.tgz"; - sha512 = "fEnkDOKpvp6qc+olg7+NzE1SqyfiyKf4uci7fAU38M3zxs0YOyKOxW/nMZ2l9sJbt7KZHcDIxUnbI0Iime7V4w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz"; + sha512 = "2rtJwDmSZ716Pxm1wCtbPvHtbDWAreTPxXbkc5RkKglow3Ig/4GNGazDI9/BVnXbG/wnv6r3B5FEbkfg9OcTGg=="; }; }; "canvas-2.9.3" = { @@ -19040,22 +19004,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.4.7" = { + "cdk8s-2.4.8" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.4.7.tgz"; - sha512 = "a28azxY09RNbOuZHxadeZMY9Ew7a4pmDDFY2f2kraonP/ehiy54bboJPQL5cgokC6SsAopzNjSNPy2K17kooKQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.4.8.tgz"; + sha512 = "ekgGhXoQVYEkPvZWH/zjvYNyWn0AjqCR6wVhNL6s49cWsWZC/SUql/YFyW4+z9eaHpitnjR1H1JmQWo1oiDh6Q=="; }; }; - "cdk8s-plus-22-2.0.0-rc.90" = { + "cdk8s-plus-22-2.0.0-rc.91" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "2.0.0-rc.90"; + version = "2.0.0-rc.91"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.90.tgz"; - sha512 = "ULxn3GAvMVLefla6ErHcvTjFKo5q+VF0H//FO+iUtFVY1pm9QbhnfpPmVa+ZSot42iSxe5BCepJtNpjJUmE6vQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.91.tgz"; + sha512 = "Ui3CI5pGdKMUi4TAqOkPGesHOhYYcQqPLzwCAQWtumcJ4+MZB36qtRukmuApxGWKLE0gwX7PbjJrrg512RGuVA=="; }; }; "cdktf-0.12.1" = { @@ -19598,6 +19562,15 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; + "chroma-js-1.3.7" = { + name = "chroma-js"; + packageName = "chroma-js"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-1.3.7.tgz"; + sha512 = "ARq0P94NObL8hdQbgc+E33X9OHiNzdHO7epe3nC/KgxNRxkQcFpzNqnGeFjvOY2GxfVhbia686NXD2jByb1o0g=="; + }; + }; "chroma-js-2.4.2" = { name = "chroma-js"; packageName = "chroma-js"; @@ -20489,6 +20462,15 @@ let sha512 = "ZZjKqOeNgXtz40seJmSYbfAsIGJVzDIAn30w0QRmnyXHFrjEXhW/K8ZgRw5FtsezYFQEuZXSp93S0UkKJHuhKg=="; }; }; + "cluster-key-slot-1.1.0" = { + name = "cluster-key-slot"; + packageName = "cluster-key-slot"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; + sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + }; + }; "cmd-shim-2.1.0" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -21209,15 +21191,6 @@ let sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; }; }; - "common-tags-1.8.0" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; - sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; - }; - }; "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; @@ -21650,13 +21623,13 @@ let sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w=="; }; }; - "connect-redis-4.0.3" = { + "connect-redis-6.1.3" = { name = "connect-redis"; packageName = "connect-redis"; - version = "4.0.3"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.3.tgz"; - sha512 = "Php0P0ShNfilW6f2d/2v7Q0VAiFeBYsg0bIgu8ST3x26CcQ1JtzV6vxPLUwK0uiq10hQSMR+HzSNhWbcvx6nLg=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-6.1.3.tgz"; + sha512 = "aaNluLlAn/3JPxRwdzw7lhvEoU6Enb+d83xnokUNhC9dktqBoawKWL+WuxinxvBLTz6q9vReTnUDnUslaz74aw=="; }; }; "console-browserify-1.1.0" = { @@ -21740,13 +21713,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.83" = { + "constructs-10.1.84" = { name = "constructs"; packageName = "constructs"; - version = "10.1.83"; + version = "10.1.84"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.83.tgz"; - sha512 = "SXwMtiEMgM5Nmzubk2lHXVCHrSLwzNGyz7ZiV5piLUzmzbm7WQl/o5gzSJTUDPbNa/2JcY3lXYeb1AcCM+2GuQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.84.tgz"; + sha512 = "UeKlo2RAQOC7WR38qcGMGtvQse0gRK72eWBAik+/O7HEg0i4w3I6PzycXoNL48Y0qMQG1LF6g3+d84j9LCEt8A=="; }; }; "consume-http-header-1.0.0" = { @@ -22713,13 +22686,13 @@ let sha512 = "59brGxFHoWWXzpFKAwD/vB/BYTALDuf+1Wmajxq2ZYnllJtg8SwfcmP7PHCKas5mDTZLD4om1cneC1YMZFuPUA=="; }; }; - "cron-parser-2.18.0" = { + "cron-parser-3.5.0" = { name = "cron-parser"; packageName = "cron-parser"; - version = "2.18.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; - sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-3.5.0.tgz"; + sha512 = "wyVZtbRs6qDfFd8ap457w3XVntdvqcwBGxBoTvJQH9KGVKL/fB+h2k3C8AqiVxvUQKN1Ps/Ns46CNViOpVDhfQ=="; }; }; "croner-4.1.97" = { @@ -25026,15 +24999,6 @@ let sha512 = "OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ=="; }; }; - "deep-copy-1.4.2" = { - name = "deep-copy"; - packageName = "deep-copy"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-copy/-/deep-copy-1.4.2.tgz"; - sha512 = "VxZwQ/1+WGQPl5nE67uLhh7OqdrmqI1OazrraO9Bbw/M8Bt6Mol/RxzDA6N6ZgRXpsG/W9PgUj8E1LHHBEq2GQ=="; - }; - }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -26493,13 +26457,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.3.10" = { + "dompurify-2.3.11" = { name = "dompurify"; packageName = "dompurify"; - version = "2.3.10"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz"; - sha512 = "o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.11.tgz"; + sha512 = "q4c/TZfHWTPGgNBaMimQ1+bEfgo2d1G5wEnolfF3+IX2WoVw/QzOwqTyu+ylTLZDGzmsTQUnZ1gKpAGedceXMA=="; }; }; "dompurify-2.3.5" = { @@ -27087,13 +27051,13 @@ let sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; }; - "electron-packager-15.5.1" = { + "electron-packager-15.5.2" = { name = "electron-packager"; packageName = "electron-packager"; - version = "15.5.1"; + version = "15.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.5.1.tgz"; - sha512 = "9/fqF64GACZsLYLuFJ8vCqItMXbvsD0NMDLNfFmAv9mSqkqKWSZb5V3VE9CxT6CeXwZ6wN3YowEQuqBNyShEVg=="; + url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.5.2.tgz"; + sha512 = "8zUdkSONn0jomu/efqoxApGzgqIb56ooMs671HeB/BXTPnWcWvqpEY08g16PL6ok2ymA5zPj8vmUszLrq99F0Q=="; }; }; "electron-rebuild-3.2.9" = { @@ -27105,13 +27069,13 @@ let sha512 = "FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw=="; }; }; - "electron-to-chromium-1.4.225" = { + "electron-to-chromium-1.4.227" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.225"; + version = "1.4.227"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz"; - sha512 = "ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.227.tgz"; + sha512 = "I9VVajA3oswIJOUFg2PSBqrHLF5Y+ahIfjOV9+v6uYyBqFZutmPxA6fxocDUUmgwYevRWFu1VjLyVG3w45qa/g=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -29681,13 +29645,13 @@ let sha512 = "92H8nuvO1vVMutapDqQXESOxFnaC4/tZAXSi7kJMD+xWXZwNwmuinCxbfQc7JyUY6Y3+vjFXqJ7xeTCpsUhSiA=="; }; }; - "express-prom-bundle-6.3.0" = { + "express-prom-bundle-6.5.0" = { name = "express-prom-bundle"; packageName = "express-prom-bundle"; - version = "6.3.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.3.0.tgz"; - sha512 = "XeA9pzG+07X5JhR4SV0szQnb2pWBaeNMBb1jBox/d70204jPlcLPoNuCpaQs5kOEedoXJtJEbVJ2esivED1WyA=="; + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.5.0.tgz"; + sha512 = "paFAm0FK7TV1Ln6Blh9edDt2mJ4Pk6Py/fjhZDMcoMHENYryBjCpnXDXuCu8NE1kkvp58IrPcAAkNeNqdvZnnw=="; }; }; "express-request-id-1.4.1" = { @@ -29699,15 +29663,6 @@ let sha512 = "qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw=="; }; }; - "express-session-1.17.1" = { - name = "express-session"; - packageName = "express-session"; - version = "1.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; - sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; - }; - }; "express-session-1.17.3" = { name = "express-session"; packageName = "express-session"; @@ -30068,6 +30023,15 @@ let sha512 = "wdRazMMeM2pl8hq1lFG8fzix8p1VLAJunTTE2RADiFBwbUfZwybUm6IwPrmMS7qTthiayr166NoXeqWe3hfR5w=="; }; }; + "fast-copy-2.1.3" = { + name = "fast-copy"; + packageName = "fast-copy"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.3.tgz"; + sha512 = "LDzYKNTHhD+XOp8wGMuCkY4eTxFZOOycmpwLBiuF3r3OjOmZnURRD8t2dUAbmKuXGbo/MGggwbSjcBdp8QT0+g=="; + }; + }; "fast-csv-4.3.6" = { name = "fast-csv"; packageName = "fast-csv"; @@ -30239,13 +30203,13 @@ let sha512 = "xEHkLUEmStETI+15zhglJLO9TjXxNkkp2ldEfYVZdcqxFhM172EfGl1irI6mVlTxXspYKH1/kjevnt/XSsPeFA=="; }; }; - "fast-redact-3.1.1" = { + "fast-redact-3.1.2" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.1.tgz"; - sha512 = "odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.2.tgz"; + sha512 = "+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -32480,6 +32444,15 @@ let sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ=="; }; }; + "generic-pool-3.8.2" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz"; + sha512 = "nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="; + }; + }; "gensequence-3.1.1" = { name = "gensequence"; packageName = "gensequence"; @@ -35064,6 +35037,15 @@ let sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; + "help-me-4.0.1" = { + name = "help-me"; + packageName = "help-me"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-4.0.1.tgz"; + sha512 = "PLv01Z+OhEPKj2QPYB4kjoCUkopYNPUK3EROlaPIf5bib752fZ+VCvGDAoA+FXo/OwCyLEA4D2e0mX8+Zhcplw=="; + }; + }; "here-0.0.2" = { name = "here"; packageName = "here"; @@ -35352,15 +35334,6 @@ let sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; }; }; - "hpagent-0.1.2" = { - name = "hpagent"; - packageName = "hpagent"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz"; - sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; - }; - }; "hpagent-1.0.0" = { name = "hpagent"; packageName = "hpagent"; @@ -35415,6 +35388,15 @@ let sha512 = "7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA=="; }; }; + "hsluv-0.0.3" = { + name = "hsluv"; + packageName = "hsluv"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hsluv/-/hsluv-0.0.3.tgz"; + sha512 = "08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ=="; + }; + }; "html-encoding-sniffer-1.0.2" = { name = "html-encoding-sniffer"; packageName = "html-encoding-sniffer"; @@ -36963,6 +36945,15 @@ let sha512 = "TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw=="; }; }; + "ini-3.0.1" = { + name = "ini"; + packageName = "ini"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz"; + sha512 = "it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ=="; + }; + }; "init-package-json-2.0.5" = { name = "init-package-json"; packageName = "init-package-json"; @@ -39465,13 +39456,13 @@ let sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; }; }; - "isomorphic-git-1.10.5" = { + "isomorphic-git-1.19.2" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "1.10.5"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.5.tgz"; - sha512 = "hcD5SkH36iv2ooM9VCY3kPOYtCgxjw52LmqB6sj5oWlDu/IbI3mYtPdok2lmR5dzmCoaUT7pCXz847AWW7Mv3w=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.19.2.tgz"; + sha512 = "14Tbf3GRFNoXw+fy6ssK7gpDZQxF+NytHmg7p+5L38IAVUafHnfjzJ0ZnEmLz3SAG20wYYyB+HufkRAFRttYxQ=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -40060,6 +40051,15 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; + "js-yaml-3.12.2" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz"; + sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; + }; + }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -40285,13 +40285,13 @@ let sha512 = "5yP4YRPE/cvtthyOwAGZkOQdEBS3AlGuXKY5AI8VJSUJ1tHwz90d61Yis6JxYvGkrNK/6YBSowuXbRdo1GG37Q=="; }; }; - "jsii-srcmak-0.1.655" = { + "jsii-srcmak-0.1.656" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.655"; + version = "0.1.656"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.655.tgz"; - sha512 = "j3o73LE8Yu4BDJT1EGfTPAydul6UqN/4Dez5cfcOvIUWY1SEz6NrLeB2fTcaREr+wBzEg4HZkdfixPfP4CsJfA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.656.tgz"; + sha512 = "ErkEoCApvAWvaaXZYdnzkDBAUDGuWjP6NI9ERPt4I/RkMgbWNJnIIDyyJ97C4FraqHuGRPzPxlsWYhJavwO2Rg=="; }; }; "json-bigint-1.0.0" = { @@ -40627,13 +40627,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.3.103" = { + "json2jsii-0.3.104" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.103"; + version = "0.3.104"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.103.tgz"; - sha512 = "MqXAfW+bCsa5UDK/PUUUj2rW5ijHbo2FLXyHEvpM+tkxbTHsikrA8wi/mpoGgjgBST5XCY3Z6XVijWxsBItYxQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.104.tgz"; + sha512 = "xE22az8kTn2rWkpXfgbnT4KeJBtcfRQ6KvcVoiZcabepkapwrvIWhHE6FAuqEofwWpzmXGGjIJE22+Ie98lxuw=="; }; }; "json3-3.2.6" = { @@ -42220,13 +42220,13 @@ let sha512 = "ghban3KbqkbzahwIp4NAtuhc8xIurVcCXAd7tV6qGkFYKZAy9loIvFrhZqoWF4A4jnaKbRnJPCaxzJ8JwPl3EA=="; }; }; - "lightning-5.16.6" = { + "lightning-5.19.0" = { name = "lightning"; packageName = "lightning"; - version = "5.16.6"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.16.6.tgz"; - sha512 = "WDlE2UzaDXuzOXm5/INUnvTMxWdJGOMYqqfLI/RUfwu7U0w3CLIBqT8PE20Y4elx8BTYwbG7HU4/etnj5hybvw=="; + url = "https://registry.npmjs.org/lightning/-/lightning-5.19.0.tgz"; + sha512 = "ALaqRMWmc6fiZ2e0UvB8B4+QVqaBt43NmUhpFG+TDLP5dZFdOkV2vxdElaIh23iI8l4P4XPRGQQIFJnTJhlEOQ=="; }; }; "lilconfig-2.0.6" = { @@ -42481,13 +42481,13 @@ let sha512 = "/lyDSuovNrBub1oGLhWGWsre1q9YHRVroMyZ5wybcXhBTFgB/m1gEc7HK8VPzwtLVptd9OkRFwgCZSms0e4p4Q=="; }; }; - "ln-service-53.17.5" = { + "ln-service-53.20.0" = { name = "ln-service"; packageName = "ln-service"; - version = "53.17.5"; + version = "53.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.17.5.tgz"; - sha512 = "8aaCYiMe6MdRGbCMvs/Vob3OIv6TqXeSIdsA0EX+FQkxb/2Z0YqJICS0J4d4Ooy3S2HA+wVNVwRSAyrISsSefA=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.20.0.tgz"; + sha512 = "kp6rgO4VhU1+xYkc6SFUd/+ZbWrZ2TAz3FBUfoRCNClzob4DONfdA0HM0yEX4BgJUQw+TtzNmM/fffYRHMf+tA=="; }; }; "ln-sync-3.12.1" = { @@ -44615,6 +44615,15 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; + "luxon-1.28.0" = { + name = "luxon"; + packageName = "luxon"; + version = "1.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-1.28.0.tgz"; + sha512 = "TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ=="; + }; + }; "luxon-2.4.0" = { name = "luxon"; packageName = "luxon"; @@ -44957,6 +44966,15 @@ let sha512 = "CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww=="; }; }; + "mapnik-reference-8.10.0" = { + name = "mapnik-reference"; + packageName = "mapnik-reference"; + version = "8.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-8.10.0.tgz"; + sha512 = "BuvyCeE9Glf6YmMtTy+s4BhJAwFNygwcwKVJ4gRN4gJLQmDASmotNCwf9A3sw2JO/ynfYLFXpCpOCms2L77Nbg=="; + }; + }; "mark.js-8.11.1" = { name = "mark.js"; packageName = "mark.js"; @@ -46784,15 +46802,6 @@ let sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-db-1.42.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.42.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; - sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; - }; - }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -46838,15 +46847,6 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; - "mime-types-2.1.25" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.25"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; - sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; - }; - }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -47207,13 +47207,13 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; - "minipass-fetch-2.1.1" = { + "minipass-fetch-2.1.2" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.1.tgz"; - sha512 = "/kgtXVGS10PTFET6dAbOBWQtgH+iDiI4NhRqAftojRlsOJhk0y45sVVxqCaRQC+AMFH7JkHiWpuKJKQ+mojKiA=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; + sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; }; }; "minipass-flush-1.0.5" = { @@ -47720,15 +47720,6 @@ let sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; - "mri-1.1.4" = { - name = "mri"; - packageName = "mri"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz"; - sha512 = "6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w=="; - }; - }; "mri-1.2.0" = { name = "mri"; packageName = "mri"; @@ -49503,15 +49494,6 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "node-redis-pubsub-5.0.0" = { - name = "node-redis-pubsub"; - packageName = "node-redis-pubsub"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-redis-pubsub/-/node-redis-pubsub-5.0.0.tgz"; - sha512 = "SBDgfC2QwKLDYbUYNE/jDQxOU1Vg0NDf4fVNQZWnd/tXEhn/N1wY3SxaEXmHWPXhB2nqwZD5fH08SE2g07oMIA=="; - }; - }; "node-releases-1.1.77" = { name = "node-releases"; packageName = "node-releases"; @@ -49539,13 +49521,13 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; - "node-schedule-1.3.2" = { + "node-schedule-2.1.0" = { name = "node-schedule"; packageName = "node-schedule"; - version = "1.3.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.2.tgz"; - sha512 = "GIND2pHMHiReSZSvS6dpZcDH7pGPGFfWBIEud6S00Q8zEIzAs9ommdyRK1ZbQt8y1LyZsJYZgPnyi7gpU2lcdw=="; + url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.0.tgz"; + sha512 = "nl4JTiZ7ZQDc97MmpTq9BQjYhq7gOtoh7SiPH069gBFBj0PzD8HI7zyFs6rzqL8Y5tTiEEYLxgtbx034YPrbyQ=="; }; }; "node-ssdp-2.9.1" = { @@ -50439,13 +50421,13 @@ let sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; }; }; - "nx-14.5.8" = { + "nx-14.5.9" = { name = "nx"; packageName = "nx"; - version = "14.5.8"; + version = "14.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-14.5.8.tgz"; - sha512 = "yTWL4pyzevWORx0GzXElTeoH19pvvOt0v98kXWjNU4TTB1vWlMiHEFAkfqScFrUX0L/efulYoEVjTgPdNtmInA=="; + url = "https://registry.npmjs.org/nx/-/nx-14.5.9.tgz"; + sha512 = "EWl0bCK2lyTOd+aG87nCSkQNHDBnXKul6IVLmoN0qA/xu/088Z2d55dKwvOV6wLUxrFqh/qtpc8mMNKn3ACDsA=="; }; }; "nyc-15.1.0" = { @@ -50917,15 +50899,6 @@ let sha512 = "YLf6BqHAVVGDmMpEe5J7ky1n6VSECN4Ced40sG/jfKoKhYQU247PsEekscVqHjR4bRj4aKrmFJS47A1kbrclsA=="; }; }; - "on-exit-leak-free-0.2.0" = { - name = "on-exit-leak-free"; - packageName = "on-exit-leak-free"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz"; - sha512 = "dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg=="; - }; - }; "on-exit-leak-free-2.1.0" = { name = "on-exit-leak-free"; packageName = "on-exit-leak-free"; @@ -52501,13 +52474,13 @@ let sha512 = "LmthAiL2EP/iYorDmSZFpi8ocQmciYWAirzPYWGhIPOLs409btO2tfjM/fY839qFzxzHpONRVx8CwuyqKLtolg=="; }; }; - "paid-services-3.20.2" = { + "paid-services-3.20.3" = { name = "paid-services"; packageName = "paid-services"; - version = "3.20.2"; + version = "3.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.20.2.tgz"; - sha512 = "X67rWBIW0hPy0tEEsC0sSJzGha9gMuD6Ssg29n+FmqdfvmCnNLVgNiatjDNsczm2pedbFnnshD3SRY0HBm/qxA=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.20.3.tgz"; + sha512 = "L8HBnYt82FCHlu0vU2ZHSbpfwttuhpZ6JB3D9eBao0Y092PEobSeZw5CJYffSi4lKVWhb1gHgRguuyrDPVbL9A=="; }; }; "pako-0.2.9" = { @@ -53779,15 +53752,6 @@ let sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="; }; }; - "pino-7.6.5" = { - name = "pino"; - packageName = "pino"; - version = "7.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-7.6.5.tgz"; - sha512 = "38tAwlJ7HevMENHD5FZE+yxSlAH5Wg3FoOjbB3MX2j3/kgpOEkmDHhTVKkecR57qxD5doHo2yi9nac94gqqbiQ=="; - }; - }; "pino-8.4.0" = { name = "pino"; packageName = "pino"; @@ -53797,13 +53761,13 @@ let sha512 = "R95U66WOb4Ggtb1RPGnC2uvtc8T0i1FSbrKHrAudRtiLDrlNxKjM1MyCJu+V4gL0qdE/7/LoXAmkEY/TlX6ELA=="; }; }; - "pino-abstract-transport-0.5.0" = { - name = "pino-abstract-transport"; - packageName = "pino-abstract-transport"; - version = "0.5.0"; + "pino-8.4.2" = { + name = "pino"; + packageName = "pino"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz"; - sha512 = "+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ=="; + url = "https://registry.npmjs.org/pino/-/pino-8.4.2.tgz"; + sha512 = "PlXDeGhJZfAuVay+wtlS02s5j8uisQveZExYdAm9MwwxUQSz9R7Q78XtjM2tTa4sa5KJmygimZjZxXXuHgV6ew=="; }; }; "pino-abstract-transport-1.0.0" = { @@ -53815,22 +53779,13 @@ let sha512 = "c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA=="; }; }; - "pino-pretty-7.3.0" = { + "pino-pretty-9.0.1" = { name = "pino-pretty"; packageName = "pino-pretty"; - version = "7.3.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-7.3.0.tgz"; - sha512 = "HAhShJ2z2QzxXhYAn6XfwYpF13o1PQbjzSNA9q+30FAvhjOmeACit9lprhV/mCOw/8YFWSyyNk0YCq2EDYGYpw=="; - }; - }; - "pino-std-serializers-4.0.0" = { - name = "pino-std-serializers"; - packageName = "pino-std-serializers"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz"; - sha512 = "cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q=="; + url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-9.0.1.tgz"; + sha512 = "5gFIIeDu1niFlL0pBACerwDR8Ts+i4gO0W9S0jRoHVvaQluvGOW4cUaDmC+/dSTCoG4VqfOQhP0dwuDLd0qJ6A=="; }; }; "pino-std-serializers-6.0.0" = { @@ -55426,13 +55381,13 @@ let sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; }; }; - "prettier-plugin-astro-0.5.0" = { + "prettier-plugin-astro-0.5.1" = { name = "prettier-plugin-astro"; packageName = "prettier-plugin-astro"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.5.0.tgz"; - sha512 = "wBDZs0hlPWQDc7P7VmGe8pImci6F434Wd/otfLJwvCSXRb9J7AhmAigXhm5WPgCJuBA509Ovo/Ed+LAgZy4KWg=="; + url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.5.1.tgz"; + sha512 = "u6Ueb5dJFLzSkWwBFdx1rf/bSsdWt9arLWgvcxbDO9hS6kZs9QZHvYdZyJmywaYlH606eHA4578ncjY0bdDSQw=="; }; }; "prettier-plugin-svelte-2.7.0" = { @@ -55570,13 +55525,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.28.0" = { + "prismjs-1.29.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz"; - sha512 = "8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz"; + sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="; }; }; "private-0.1.8" = { @@ -55696,15 +55651,6 @@ let sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg=="; }; }; - "process-warning-1.0.0" = { - name = "process-warning"; - packageName = "process-warning"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz"; - sha512 = "du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q=="; - }; - }; "process-warning-2.0.0" = { name = "process-warning"; packageName = "process-warning"; @@ -55777,15 +55723,6 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; - "prom-client-12.0.0" = { - name = "prom-client"; - packageName = "prom-client"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz"; - sha512 = "JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ=="; - }; - }; "prom-client-14.0.1" = { name = "prom-client"; packageName = "prom-client"; @@ -57226,15 +57163,6 @@ let sha512 = "7Au6iC98rS6WEAD110V4Bxd0iIbqoFtzz9XzkG1BSofidS1VAJ881E1+GFR7Xn2Yea0hbj8n0ErzRyseMp1Ctg=="; }; }; - "purest-3.1.0" = { - name = "purest"; - packageName = "purest"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/purest/-/purest-3.1.0.tgz"; - sha512 = "9slCC5je2UNERS/YNcrs1/7K5Bh7Uvl6OY1S+XZ6iDNMCwk8Fio6VBdrklo7eMzt5M/Wt2fQlwXRjn4puBccRQ=="; - }; - }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -58783,15 +58711,6 @@ let sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; }; }; - "real-require-0.1.0" = { - name = "real-require"; - packageName = "real-require"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/real-require/-/real-require-0.1.0.tgz"; - sha512 = "r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg=="; - }; - }; "real-require-0.2.0" = { name = "real-require"; packageName = "real-require"; @@ -58936,15 +58855,6 @@ let sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; }; }; - "redis-3.1.1" = { - name = "redis"; - packageName = "redis"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz"; - sha512 = "QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg=="; - }; - }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -58954,6 +58864,15 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; + "redis-4.2.0" = { + name = "redis"; + packageName = "redis"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-4.2.0.tgz"; + sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; + }; + }; "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; @@ -61411,15 +61330,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.0" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; - }; - }; "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -61915,6 +61825,15 @@ let sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; }; }; + "semver-5.6.0" = { + name = "semver"; + packageName = "semver"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; + sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; + }; + }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -63742,15 +63661,6 @@ let sha512 = "N2gxk68Kg2qZLSJ4h0NffEhp4BjgWHCHXVlDi1aG1hA3y+ZeWEmHqnpml8Hy47QzfL1xLy5nwr9LcsWAg2Ep0A=="; }; }; - "sonic-boom-2.4.2" = { - name = "sonic-boom"; - packageName = "sonic-boom"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.4.2.tgz"; - sha512 = "zlOmAKFLJzTI+MbvmkWhnOOJ++NYo0Iy7F93ARNPmvZvpWG2l8Ff3uwM3CkpHqRw8v3pcRROScM5E+vbeTeOKw=="; - }; - }; "sonic-boom-3.2.0" = { name = "sonic-boom"; packageName = "sonic-boom"; @@ -64138,13 +64048,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.11" = { + "spdx-license-ids-3.0.12" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.11"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; - sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; + sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; }; }; "spdx-license-list-6.6.0" = { @@ -67839,22 +67749,13 @@ let sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; }; }; - "thread-stream-0.13.2" = { + "thread-stream-2.1.0" = { name = "thread-stream"; packageName = "thread-stream"; - version = "0.13.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.2.tgz"; - sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; - }; - }; - "thread-stream-2.0.1" = { - name = "thread-stream"; - packageName = "thread-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-2.0.1.tgz"; - sha512 = "X7vWOdsHLkBq0si20ruEE2ttpS7WOVyD52xKu+TOjrRP9Qi9uB9ynHYpzZUbBptArBSuKYUn4mH+jEBnO2CRGg=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-2.1.0.tgz"; + sha512 = "5+Pf2Ya31CsZyIPYYkhINzdTZ3guL+jHq7D8lkBybgGcSQIKDbid3NJku3SpCKeE/gACWAccDA/rH2B6doC5aA=="; }; }; "thriftrw-3.12.0" = { @@ -68721,6 +68622,15 @@ let sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; }; }; + "tough-cookie-4.1.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.0.tgz"; + sha512 = "IVX6AagLelGwl6F0E+hoRpXzuD192cZhAcmT7/eoLr0PnsB1wv2E5c+A2O+V8xth9FlL2p0OstFsWn0bZpVn4w=="; + }; + }; "township-client-1.3.2" = { name = "township-client"; packageName = "township-client"; @@ -69378,13 +69288,13 @@ let sha512 = "BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA=="; }; }; - "tus-js-client-2.1.1" = { + "tus-js-client-3.0.0" = { name = "tus-js-client"; packageName = "tus-js-client"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-2.1.1.tgz"; - sha512 = "ILpgHlR0nfKxmlkXfrZ2z61upkHEXhADOGbGyvXSPjp7bn1NhU50p/Mu59q577Xirayr9vlW4tmoFqUrHKcWeQ=="; + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-3.0.0.tgz"; + sha512 = "PHWI/K8YrCzpc83MqkLhqm89EGG+pPrkBaJ/0NQH0xQoqxfs7HKqAqfXrjmcw2CHZeGYaqxI6oVcolXThzYOSA=="; }; }; "tv4-1.3.0" = { @@ -69648,15 +69558,6 @@ let sha512 = "lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw=="; }; }; - "type-fest-2.18.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz"; - sha512 = "pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="; - }; - }; "type-fest-2.18.1" = { name = "type-fest"; packageName = "type-fest"; @@ -69666,6 +69567,15 @@ let sha512 = "UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="; }; }; + "type-fest-2.19.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz"; + sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -70962,6 +70872,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-0.2.0" = { + name = "universalify"; + packageName = "universalify"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"; + sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; + }; + }; "universalify-1.0.0" = { name = "universalify"; packageName = "universalify"; @@ -71844,15 +71763,6 @@ let sha512 = "jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="; }; }; - "uuid-8.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz"; - sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; - }; - }; "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; @@ -72006,15 +71916,6 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; - "validator-12.2.0" = { - name = "validator"; - packageName = "validator"; - version = "12.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz"; - sha512 = "jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="; - }; - }; "validator-13.7.0" = { name = "validator"; packageName = "validator"; @@ -73518,13 +73419,13 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; - "vue-2.7.9" = { + "vue-2.7.10" = { name = "vue"; packageName = "vue"; - version = "2.7.9"; + version = "2.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.9.tgz"; - sha512 = "GeWCvAUkjzD5q4A3vgi8ka5r9bM6g8fmNmx/9VnHDKCaEzBcoVw+7UcQktZHrJ2jhlI+Zv8L57pMCIwM4h4MWg=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; + sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; }; }; "vue-class-component-7.2.6" = { @@ -76656,7 +76557,7 @@ in sources."minimatch-3.1.2" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -76730,7 +76631,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."ssri-9.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -76791,72 +76692,65 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-3.0.3.tgz"; - sha512 = "tY+gGI23sUViRhXweIjTU/J51NclZ6TNbsbXMnDev1RsaEnIaWR0QOOej8Wf/asbcA5ZORkPqB1pPfUblEhODw=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-3.1.0.tgz"; + sha512 = "TjVU2W0cfSSR6yRq2dEQphJNrUPjKCP+lzx/RIU1XJRq0D93BU3bMdmc+ZyjLMfXLItxg2kiUeSzJXZeDlOZ1A=="; }; dependencies = [ sources."@antora/expand-path-helper-2.0.0" - sources."@antora/logger-3.0.3" - sources."@antora/playbook-builder-3.0.3" + sources."@antora/logger-3.1.0" + sources."@antora/playbook-builder-3.1.0" sources."@antora/user-require-helper-2.0.0" sources."@iarna/toml-2.2.5" - sources."ansi-styles-3.2.1" + sources."abort-controller-3.0.0" sources."argparse-2.0.1" - sources."args-5.0.3" sources."atomic-sleep-1.0.0" - sources."camelcase-5.0.0" - (sources."camelcase-keys-7.0.2" // { - dependencies = [ - sources."camelcase-6.3.0" - ]; - }) - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."balanced-match-1.0.2" + sources."brace-expansion-2.0.1" sources."colorette-2.0.19" - sources."commander-8.3.0" + sources."commander-9.4.0" sources."convict-6.2.3" sources."dateformat-4.6.3" - sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - sources."fast-redact-3.1.1" + sources."event-target-shim-5.0.1" + sources."fast-copy-2.1.3" + sources."fast-redact-3.1.2" sources."fast-safe-stringify-2.1.1" - sources."has-flag-3.0.0" + sources."fs.realpath-1.0.0" + sources."glob-8.0.3" + (sources."help-me-4.0.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."inflight-1.0.6" sources."inherits-2.0.4" sources."joycon-3.1.1" sources."js-yaml-4.1.0" sources."json5-2.2.1" - sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" - sources."map-obj-4.3.0" - sources."mri-1.1.4" - sources."on-exit-leak-free-0.2.0" + sources."minimatch-5.1.0" + sources."minimist-1.2.6" + sources."on-exit-leak-free-2.1.0" sources."once-1.4.0" - sources."pino-7.6.5" - sources."pino-abstract-transport-0.5.0" - sources."pino-pretty-7.3.0" - sources."pino-std-serializers-4.0.0" - sources."process-warning-1.0.0" + sources."pino-8.4.2" + sources."pino-abstract-transport-1.0.0" + sources."pino-pretty-9.0.1" + sources."pino-std-serializers-6.0.0" + sources."process-warning-2.0.0" sources."pump-3.0.0" sources."quick-format-unescaped-4.0.4" - sources."quick-lru-5.1.1" - sources."readable-stream-3.6.0" - sources."real-require-0.1.0" - sources."rfdc-1.3.0" + sources."readable-stream-4.1.0" + sources."real-require-0.2.0" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."secure-json-parse-2.5.0" - sources."sonic-boom-2.4.2" + sources."sonic-boom-3.2.0" sources."split2-4.1.0" - sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" - sources."thread-stream-0.13.2" - sources."type-fest-1.4.0" + sources."thread-stream-2.1.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" sources."yargs-parser-20.2.9" @@ -76874,38 +76768,33 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.3.tgz"; - sha512 = "SlCuWg3Dlf7Uk7YZ1yYwHh/Lb1Dom+cEzB7wpzZkmoSfcR9Rms751qS06sUINVPA4y04ka2ugjbXDCafPmAZcg=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.1.0.tgz"; + sha512 = "YwdW9IwIsC43WhDGVRfF/1yN6EPkpBC5Qo93cDLaNVCuqsM5wO3m1zLI/kdC/8dXfGTWdhVMbLBTXFW2pnkEMQ=="; }; dependencies = [ - sources."@antora/asciidoc-loader-3.0.3" - sources."@antora/content-aggregator-3.0.3" - sources."@antora/content-classifier-3.0.3" - sources."@antora/document-converter-3.0.3" + sources."@antora/asciidoc-loader-3.1.0" + sources."@antora/content-aggregator-3.1.0" + sources."@antora/content-classifier-3.1.0" + sources."@antora/document-converter-3.1.0" sources."@antora/expand-path-helper-2.0.0" - sources."@antora/file-publisher-3.0.3" - sources."@antora/logger-3.0.3" - sources."@antora/navigation-builder-3.0.3" - sources."@antora/page-composer-3.0.3" - sources."@antora/playbook-builder-3.0.3" - sources."@antora/redirect-producer-3.0.3" - sources."@antora/site-generator-3.0.3" - sources."@antora/site-mapper-3.0.3" - sources."@antora/site-publisher-3.0.3" - sources."@antora/ui-loader-3.0.3" + sources."@antora/file-publisher-3.1.0" + sources."@antora/logger-3.1.0" + sources."@antora/navigation-builder-3.1.0" + sources."@antora/page-composer-3.1.0" + sources."@antora/playbook-builder-3.1.0" + sources."@antora/redirect-producer-3.1.0" + sources."@antora/site-generator-3.1.0" + sources."@antora/site-mapper-3.1.0" + sources."@antora/site-publisher-3.1.0" + sources."@antora/ui-loader-3.1.0" sources."@antora/user-require-helper-2.0.0" sources."@asciidoctor/core-2.2.6" sources."@iarna/toml-2.2.5" - sources."ansi-styles-3.2.1" + sources."abort-controller-3.0.0" sources."append-buffer-1.0.2" sources."argparse-2.0.1" - (sources."args-5.0.3" // { - dependencies = [ - sources."camelcase-5.0.0" - ]; - }) sources."asciidoctor-opal-runtime-0.3.3" sources."async-lock-1.3.2" sources."atomic-sleep-1.0.0" @@ -76916,9 +76805,6 @@ in sources."buffer-equal-1.0.0" sources."cache-directory-2.0.0" sources."call-bind-1.0.2" - sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.2" - sources."chalk-2.4.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -76928,8 +76814,6 @@ in sources."readable-stream-2.3.7" ]; }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."colorette-2.0.19" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -76937,14 +76821,15 @@ in sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."dateformat-4.6.3" - sources."decompress-response-4.2.1" + sources."decompress-response-6.0.0" sources."define-properties-1.1.4" sources."diff3-0.0.3" sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" + sources."event-target-shim-5.0.1" sources."extend-3.0.2" - sources."fast-redact-3.1.1" + sources."fast-copy-2.1.3" + sources."fast-redact-3.1.2" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" @@ -76968,10 +76853,16 @@ in sources."gulp-vinyl-zip-2.5.0" sources."handlebars-4.7.7" sources."has-1.0.3" - sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" - sources."hpagent-0.1.2" + (sources."help-me-4.0.1" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-8.0.3" + sources."minimatch-5.1.0" + ]; + }) + sources."hpagent-1.0.0" sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -76987,11 +76878,7 @@ in sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - (sources."isomorphic-git-1.10.5" // { - dependencies = [ - sources."simple-get-3.1.1" - ]; - }) + sources."isomorphic-git-1.19.2" sources."joycon-3.1.1" sources."js-yaml-4.1.0" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -77002,23 +76889,20 @@ in ]; }) sources."lead-1.0.0" - sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" - sources."map-obj-4.3.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" + sources."mimic-response-3.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."minimisted-2.0.1" - sources."mri-1.1.4" sources."multi-progress-4.0.0" sources."neo-async-2.6.2" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" - sources."on-exit-leak-free-0.2.0" + sources."on-exit-leak-free-2.1.0" sources."once-1.4.0" (sources."ordered-read-streams-1.0.1" // { dependencies = [ @@ -77031,47 +76915,47 @@ in sources."pend-1.2.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pino-7.6.5" - sources."pino-abstract-transport-0.5.0" - sources."pino-pretty-7.3.0" - sources."pino-std-serializers-4.0.0" + sources."pino-8.4.2" + (sources."pino-abstract-transport-1.0.0" // { + dependencies = [ + sources."readable-stream-4.1.0" + ]; + }) + (sources."pino-pretty-9.0.1" // { + dependencies = [ + sources."readable-stream-4.1.0" + ]; + }) + sources."pino-std-serializers-6.0.0" sources."process-nextick-args-2.0.1" - sources."process-warning-1.0.0" + sources."process-warning-2.0.0" sources."progress-2.0.3" sources."pump-3.0.0" sources."pumpify-2.0.1" sources."queue-4.5.1" sources."quick-format-unescaped-4.0.4" - sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" - sources."real-require-0.1.0" + sources."real-require-0.2.0" sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" sources."remove-trailing-separator-1.1.0" sources."replace-ext-1.0.1" sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" - sources."rfdc-1.3.0" sources."safe-buffer-5.1.2" sources."safe-stable-stringify-2.3.1" sources."secure-json-parse-2.5.0" sources."sha.js-2.4.11" sources."should-proxy-1.0.4" sources."simple-concat-1.0.1" - (sources."simple-get-4.0.1" // { - dependencies = [ - sources."decompress-response-6.0.0" - sources."mimic-response-3.1.0" - ]; - }) - sources."sonic-boom-2.4.2" + sources."simple-get-4.0.1" + sources."sonic-boom-3.2.0" sources."source-map-0.6.1" sources."split2-4.1.0" sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" - sources."thread-stream-0.13.2" + sources."thread-stream-2.1.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -77082,7 +76966,6 @@ in sources."to-absolute-glob-2.0.2" sources."to-regex-range-5.0.1" sources."to-through-2.0.0" - sources."type-fest-1.4.0" sources."uglify-js-3.17.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" @@ -77154,7 +77037,7 @@ in sources."path-key-3.1.1" sources."picocolors-1.0.0" sources."prettier-2.7.1" - sources."prettier-plugin-astro-0.5.0" + sources."prettier-plugin-astro-0.5.1" sources."s.color-0.0.15" sources."sass-formatter-0.7.5" sources."shebang-command-2.0.0" @@ -77370,6 +77253,7 @@ in sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.11.0" + sources."querystringify-2.2.0" (sources."raw-body-2.5.1" // { dependencies = [ sources."depd-2.0.0" @@ -77378,6 +77262,7 @@ in ]; }) sources."readable-stream-2.3.7" + sources."requires-port-1.0.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."run-async-2.4.1" @@ -77411,7 +77296,7 @@ in }) sources."tmp-0.0.33" sources."toidentifier-1.0.1" - sources."tough-cookie-4.0.0" + sources."tough-cookie-4.1.0" sources."tr46-2.1.0" sources."tslib-1.14.1" sources."tsscmp-1.0.6" @@ -77419,8 +77304,9 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."universalify-0.1.2" + sources."universalify-0.2.0" sources."unpipe-1.0.0" + sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" @@ -77499,7 +77385,7 @@ in sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/minimist-1.2.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -77629,7 +77515,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split2-3.2.2" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -77718,16 +77604,16 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-compilation-targets-7.18.9" - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.18.9" sources."@babel/helper-hoist-variables-7.18.6" @@ -77745,7 +77631,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" @@ -77757,8 +77643,8 @@ in sources."@babel/plugin-transform-typescript-7.18.12" sources."@babel/preset-typescript-7.18.6" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@discoveryjs/json-ext-0.5.7" sources."@forge/api-2.7.0" sources."@forge/auth-0.0.1" @@ -77787,7 +77673,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/node-fetch-2.6.2" sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { @@ -77895,7 +77781,7 @@ in }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -77979,7 +77865,7 @@ in ]; }) sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -78541,7 +78427,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -78766,7 +78652,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-lines-3.0.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -78779,7 +78665,7 @@ in sources."tr46-0.0.3" (sources."ts2gas-4.2.0" // { dependencies = [ - sources."type-fest-2.18.1" + sources."type-fest-2.19.0" ]; }) sources."tslib-2.4.0" @@ -78828,7 +78714,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."acorn-8.8.0" @@ -79189,7 +79075,7 @@ in sha512 = "tCI9Znr2FdQJREIvAFLpznskYOGigICd9wEA71Q7xHEka4RNlhKBZwzVCBH4NAPZoCLZbLYCDzW/7ursgi87Ew=="; }; dependencies = [ - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@medable/mdctl-api-1.0.66" sources."@medable/mdctl-api-driver-1.0.66" sources."@medable/mdctl-axon-tools-1.0.66" @@ -79224,7 +79110,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -80255,7 +80141,7 @@ in sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -80294,7 +80180,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -80312,7 +80198,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.10.0" @@ -80672,156 +80558,134 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "3.7.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.7.2.tgz"; - sha512 = "Uj4/00Z05+OC7htcQqSyKwTkAixww2bqOH4zmbQT8oqKlk9+1VkbXRHle1DG1fpmCAkxyFc1NMrWAzaWY9W86g=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.0.0.tgz"; + sha512 = "B9lEstKUS0aAMwBiEq4bgODfSbbE2NV2ycSfpYO/tRJp6B/p9Hcvg7VIgWRTOHVXKkO4br6OUUpuxkcarSjWwA=="; }; dependencies = [ - sources."@purest/config-1.0.1" - sources."@purest/providers-1.0.1" - sources."@request/api-0.6.0" - sources."@request/interface-0.1.0" - (sources."accepts-1.3.8" // { - dependencies = [ - sources."mime-types-2.1.35" - ]; - }) - sources."ajv-6.12.6" - sources."ansi-styles-3.2.1" + sources."@redis/bloom-1.0.2" + sources."@redis/client-1.2.0" + sources."@redis/graph-1.0.1" + sources."@redis/json-1.0.3" + sources."@redis/search-1.0.6" + sources."@redis/time-series-1.0.3" + sources."@sindresorhus/is-4.6.0" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" + sources."@types/keyv-3.1.4" + sources."@types/node-18.7.11" + sources."@types/responselike-1.0.0" + sources."accepts-1.3.8" + sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1199.0" // { - dependencies = [ - sources."uuid-8.0.0" - ]; - }) - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws-sdk-2.1200.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."bcrypt-pbkdf-1.0.2" sources."bintrees-1.0.2" - sources."body-parser-1.19.0" + sources."body-parser-1.20.0" sources."buffer-4.9.2" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-0.1.2" - sources."bytes-3.1.0" + sources."buffer-from-1.1.2" + sources."bytes-3.1.2" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caseless-0.12.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."chalk-4.1.2" + sources."clone-response-1.0.3" + sources."cluster-key-slot-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" - sources."common-tags-1.8.0" - sources."connect-redis-4.0.3" - (sources."content-disposition-0.5.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."common-tags-1.8.2" + sources."compress-brotli-1.3.8" + sources."connect-redis-6.1.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-parser-2.18.0" + sources."cron-parser-3.5.0" sources."custom-error-instance-2.1.1" - sources."dashdash-1.14.1" (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."deep-copy-1.4.2" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."defer-to-connect-2.0.1" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" - sources."denque-1.5.1" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."ecc-jsbn-0.1.2" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."es-abstract-1.20.1" sources."es-to-primitive-1.2.1" sources."escape-goat-3.0.0" sources."escape-html-1.0.3" - sources."escape-string-regexp-2.0.0" + sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" sources."events-1.1.1" - (sources."express-4.17.1" // { + (sources."express-4.18.1" // { dependencies = [ - sources."cookie-0.4.0" - sources."safe-buffer-5.1.2" + sources."cookie-0.5.0" ]; }) sources."express-interceptor-1.2.0" - sources."express-prom-bundle-6.3.0" + sources."express-prom-bundle-6.5.0" (sources."express-request-id-1.4.1" // { dependencies = [ sources."uuid-3.4.0" ]; }) - (sources."express-session-1.17.1" // { + (sources."express-session-1.17.3" // { dependencies = [ - sources."cookie-0.4.0" - sources."depd-2.0.0" - sources."safe-buffer-5.2.0" + sources."cookie-0.4.2" ]; }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."for-each-0.3.3" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" + sources."generic-pool-3.8.2" sources."get-intrinsic-1.1.2" + sources."get-stream-5.2.0" sources."get-symbol-description-1.0.0" - sources."getpass-0.1.7" + sources."got-11.8.5" sources."graceful-fs-4.2.10" - (sources."grant-4.7.0" // { - dependencies = [ - sources."qs-6.11.0" - ]; - }) - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."grant-4.7.0" sources."has-1.0.3" sources."has-bigints-1.0.2" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."helmet-4.6.0" - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."http-signature-1.2.0" + sources."http-cache-semantics-4.1.0" + sources."http-errors-2.0.0" + sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."inherits-2.0.4" @@ -80838,28 +80702,23 @@ in sources."is-number-object-1.0.7" sources."is-regex-1.1.4" sources."is-shared-array-buffer-1.0.2" + sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.9" - sources."is-typedarray-1.0.0" sources."is-weakref-1.0.2" sources."isarray-1.0.0" - sources."isobject-3.0.1" - sources."isstream-0.1.2" sources."jmespath-0.16.0" - sources."js-base64-2.6.4" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" + sources."js-base64-3.7.2" + sources."json-buffer-3.0.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."jsprim-1.4.2" sources."jwa-1.4.1" sources."jws-3.2.2" + sources."keyv-4.4.1" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -80877,66 +80736,57 @@ in sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-timeout-0.1.1" + sources."lowercase-keys-2.0.0" + sources."lru-cache-6.0.0" + sources."luxon-1.28.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" - (sources."mime-types-2.1.25" // { - dependencies = [ - sources."mime-db-1.42.0" - ]; - }) + sources."mime-types-2.1.35" + sources."mimic-response-1.0.1" sources."moment-2.29.4" sources."moment-timezone-0.5.34" (sources."morgan-1.10.0" // { dependencies = [ - sources."depd-2.0.0" + sources."on-finished-2.3.0" ]; }) - sources."ms-2.1.2" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-redis-pubsub-5.0.0" - sources."node-schedule-1.3.2" + sources."node-schedule-2.1.0" + sources."normalize-url-6.1.0" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" sources."object-keys-1.1.1" sources."object.assign-4.1.4" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."p-cancelable-2.1.1" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" - sources."performance-now-2.1.0" - sources."prom-client-12.0.0" - sources."proper-lockfile-2.0.1" + sources."prom-client-14.0.1" + sources."proper-lockfile-4.1.2" (sources."proxy-addr-2.0.7" // { dependencies = [ sources."ipaddr.js-1.9.1" ]; }) - sources."psl-1.9.0" + sources."pump-3.0.0" sources."punycode-1.3.2" - sources."purest-3.1.0" - sources."qs-6.7.0" + sources."qs-6.10.3" sources."querystring-0.2.0" sources."querystringify-2.2.0" + sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" - sources."redis-3.1.1" - sources."redis-commands-1.7.0" - sources."redis-errors-1.2.0" - sources."redis-parser-3.0.0" + sources."raw-body-2.5.1" + sources."redis-4.2.0" sources."regexp.prototype.flags-1.4.3" - (sources."request-2.88.2" // { - dependencies = [ - sources."oauth-sign-0.9.0" - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) sources."request-compose-1.2.3" (sources."request-oauth-0.0.3" // { dependencies = [ @@ -80944,60 +80794,47 @@ in ]; }) sources."requires-port-1.0.0" - sources."retry-0.10.1" + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.1" + sources."retry-0.12.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."semver-6.3.0" - (sources."send-0.17.1" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) + sources."semver-7.3.7" + sources."send-0.18.0" sources."serialize-error-2.1.0" sources."serialize-javascript-6.0.0" - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.15.0" + sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" sources."sorted-array-functions-1.3.0" - sources."sshpk-1.17.0" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."tdigest-0.1.2" - sources."toidentifier-1.0.0" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."tus-js-client-2.1.1" - sources."tweetnacl-0.14.5" + sources."toidentifier-1.0.1" + sources."tus-js-client-3.0.0" sources."type-is-1.6.18" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) sources."url-0.10.3" sources."url-parse-1.5.10" sources."url-value-parser-2.1.0" sources."util-0.12.4" sources."utils-merge-1.0.1" - sources."uuid-8.1.0" - sources."validator-12.2.0" + sources."uuid-8.0.0" + sources."validator-13.7.0" sources."vary-1.1.2" - sources."verror-1.10.0" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.8" - sources."ws-6.2.2" + sources."wrappy-1.0.2" + sources."ws-8.8.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -81041,13 +80878,13 @@ in sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -81059,7 +80896,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-create-regexp-features-plugin-7.18.6" (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ @@ -81095,7 +80932,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.18.10" @@ -81136,7 +80973,7 @@ in sources."@babel/plugin-transform-block-scoping-7.18.9" sources."@babel/plugin-transform-classes-7.18.9" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -81181,8 +81018,8 @@ in }) sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.3" // { dependencies = [ @@ -81235,7 +81072,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -81251,7 +81088,7 @@ in sources."@vue/cli-ui-addon-widgets-5.0.8" sources."@vue/compiler-core-3.2.37" sources."@vue/compiler-dom-3.2.37" - sources."@vue/compiler-sfc-2.7.9" + sources."@vue/compiler-sfc-2.7.10" sources."@vue/shared-3.2.37" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" @@ -81338,7 +81175,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -81457,7 +81294,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -81847,7 +81684,7 @@ in ]; }) sources."prepend-http-2.0.0" - sources."prismjs-1.28.0" + sources."prismjs-1.29.0" sources."private-0.1.8" (sources."process-exists-4.1.0" // { dependencies = [ @@ -81971,7 +81808,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { @@ -82083,7 +81920,7 @@ in sources."validate-npm-package-name-3.0.0" sources."value-or-promise-1.0.11" sources."vary-1.1.2" - sources."vue-2.7.9" + sources."vue-2.7.10" (sources."vue-codemod-0.0.5" // { dependencies = [ sources."inquirer-7.3.3" @@ -82258,13 +82095,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.18.12" + sources."@babel/generator-7.18.13" sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/template-7.18.10" - sources."@babel/types-7.18.10" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -82694,7 +82531,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -82824,9 +82661,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -82844,10 +82681,10 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -82861,7 +82698,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.3" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -82871,7 +82708,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -83173,7 +83010,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -83258,8 +83095,8 @@ in }; dependencies = [ sources."browserslist-4.21.3" - sources."caniuse-lite-1.0.30001381" - sources."electron-to-chromium-1.4.225" + sources."caniuse-lite-1.0.30001382" + sources."electron-to-chromium-1.4.227" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.6" @@ -83288,7 +83125,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -83296,7 +83133,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1199.0" // { + (sources."aws-sdk-2.1200.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -83880,7 +83717,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -83982,10 +83819,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "12.26.1"; + version = "12.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.26.1.tgz"; - sha512 = "1pK9dxzU6tcgS9tV25mCz0DQ5+uaNAhYeN7MSu5sL3nG9iPh4Cxt5Qq/DWdEJPFaupQFfBXXrgH5RwBpwVgt1A=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.26.3.tgz"; + sha512 = "QBZrYFjlgC/xwh5iMfIwYaRD9DTtLfHEfDG2Bpx06Sp7WlqhHv2yRpF0yVUQ9ETAFQIsLdxJ54GBFXYVxYBz/g=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -84034,7 +83871,7 @@ in sources."@types/express-serve-static-core-4.17.30" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -84206,7 +84043,7 @@ in sources."ieee754-1.2.1" sources."import-lazy-4.0.0" sources."inherits-2.0.4" - sources."ini-3.0.0" + sources."ini-3.0.1" (sources."inquirer-9.1.0" // { dependencies = [ sources."ansi-escapes-5.0.0" @@ -84313,21 +84150,21 @@ in sources."ws-8.6.0" ]; }) - (sources."ln-service-53.17.5" // { + (sources."ln-service-53.20.0" // { dependencies = [ - sources."@grpc/grpc-js-1.6.8" - sources."@grpc/proto-loader-0.7.0" - sources."@types/node-18.6.3" + sources."@grpc/grpc-js-1.6.10" + sources."@grpc/proto-loader-0.7.2" + sources."@types/node-18.7.9" sources."bitcoinjs-lib-6.0.1" sources."invoices-2.1.0" - (sources."lightning-5.16.6" // { + (sources."lightning-5.19.0" // { dependencies = [ sources."bitcoinjs-lib-6.0.2" ]; }) sources."long-5.2.0" sources."protobufjs-7.0.0" - sources."type-fest-2.18.0" + sources."type-fest-2.18.1" sources."ws-8.8.1" ]; }) @@ -84422,7 +84259,7 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p2tr-1.3.1" - (sources."paid-services-3.20.2" // { + (sources."paid-services-3.20.3" // { dependencies = [ sources."bitcoinjs-lib-6.0.1" sources."invoices-2.1.0" @@ -84814,7 +84651,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -85092,7 +84929,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -85316,8 +85153,8 @@ in sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/parser-7.18.13" + sources."@babel/types-7.18.13" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -85693,7 +85530,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" sources."standard-error-1.1.0" @@ -85782,7 +85619,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -86110,7 +85947,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.17.0" @@ -86670,7 +86507,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-on-first-1.1.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -86786,13 +86623,102 @@ in bypassCache = true; reconstructLock = true; }; + carto = nodeEnv.buildNodePackage { + name = "carto"; + packageName = "carto"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/carto/-/carto-1.2.0.tgz"; + sha512 = "WMWMOJGgBiKddgYpOs8Q1+wBb3oJCWtXKHh2TTCVjIo1MyfzVOLBXFE8zKPNkQUR4rmqi/SDaSwYQ5QT/YhjuQ=="; + }; + dependencies = [ + sources."ansi-regex-3.0.1" + sources."argparse-1.0.10" + sources."camelcase-5.3.1" + sources."chroma-js-1.3.7" + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."cross-spawn-6.0.5" + sources."decamelize-1.2.0" + sources."end-of-stream-1.4.4" + sources."esprima-4.0.1" + sources."execa-1.0.0" + sources."find-up-3.0.0" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."hsluv-0.0.3" + sources."invert-kv-2.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."js-yaml-3.12.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."map-age-cleaner-0.1.3" + sources."mapnik-reference-8.10.0" + sources."mem-4.3.0" + sources."mimic-fn-2.1.0" + sources."nice-try-1.0.5" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."pump-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."semver-5.6.0" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.7" + sources."sprintf-js-1.0.3" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.3" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Mapnik Stylesheet Compiler"; + homepage = "https://github.com/mapbox/carto#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.0.91"; + version = "2.0.92"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.91.tgz"; - sha512 = "lXsu1xEtHeU+qI6k2sO655njp//qZgltFA0j9DAYxSCSXB4iQK0X9WxuR3D07RPXZScd+NR0/riGmbYvQHTDnA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.92.tgz"; + sha512 = "DEFZmpwAHrltTPbUu1wC/BjPE/nSv8/7qBjNWfYpW0TIt/WNO8MHdJLAUuEw/lxIAAd4IunYyx2jqO0HnL1Sew=="; }; dependencies = [ sources."@jsii/check-node-1.65.0" @@ -86809,8 +86735,8 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.4.7" - sources."cdk8s-plus-22-2.0.0-rc.90" + sources."cdk8s-2.4.8" + sources."cdk8s-plus-22-2.0.0-rc.91" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -86823,7 +86749,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.83" + sources."constructs-10.1.84" sources."date-format-4.0.13" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -86877,14 +86803,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.655" // { + (sources."jsii-srcmak-0.1.656" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.103" + sources."json2jsii-0.3.104" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."log4js-6.6.1" @@ -86970,13 +86896,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.18.12" + sources."@babel/generator-7.18.13" sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/template-7.18.10" - sources."@babel/types-7.18.10" + sources."@babel/types-7.18.13" sources."@cdktf/hcl2cdk-0.12.1" sources."@cdktf/hcl2json-0.12.1" sources."@cdktf/provider-generator-0.12.1" @@ -87005,7 +86931,7 @@ in sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/node-fetch-2.6.2" sources."@types/yargs-17.0.11" sources."@types/yargs-parser-21.0.0" @@ -87040,7 +86966,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.83" + sources."constructs-10.1.84" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" sources."date-format-4.0.13" @@ -87151,7 +87077,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.655" // { + (sources."jsii-srcmak-0.1.656" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -87404,7 +87330,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."strip-final-newline-2.0.0" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" @@ -88265,10 +88191,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.67.0"; + version = "0.67.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.67.0.tgz"; - sha512 = "Eyue+npuDALqMIyanzifNtMm6uL2zyfiwRLPYtdcjwVr1STpL0mN8lG667te5y15ajaWdUENeNCjYKf9HGjFWw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.67.1.tgz"; + sha512 = "W1MQ4xwbsVzreY1zIyvgfqmhQwtTkI+8BtYYWPKNQq9n7e92e1fzzo6l/O0f6+DC8N2MKCEYAGl0Gc3rSaee1w=="; }; buildInputs = globalBuildInputs; meta = { @@ -88434,9 +88360,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -88458,10 +88384,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -88500,7 +88426,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -88537,7 +88463,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -88714,7 +88640,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."specificity-0.4.1" sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { @@ -89823,7 +89749,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-1.0.1" sources."split2-3.2.2" sources."string-width-4.2.3" @@ -90174,8 +90100,8 @@ in (sources."insight-0.11.1" // { dependencies = [ sources."chalk-4.1.2" - sources."tough-cookie-4.0.0" - sources."universalify-0.1.2" + sources."tough-cookie-4.1.0" + sources."universalify-0.2.0" sources."uuid-8.3.2" ]; }) @@ -90319,6 +90245,7 @@ in sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" + sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -90341,6 +90268,7 @@ in sources."registry-url-5.1.0" sources."request-2.88.2" sources."require-from-string-2.0.2" + sources."requires-port-1.0.0" sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" @@ -90390,7 +90318,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sshpk-1.17.0" sources."ssri-8.0.1" sources."statuses-2.0.1" @@ -90429,6 +90357,7 @@ in ]; }) sources."uri-js-4.4.1" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -90593,7 +90522,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" @@ -90633,7 +90562,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -90962,7 +90891,7 @@ in sources."@cspell/dict-swift-1.0.3" sources."@cspell/dict-typescript-2.0.1" sources."@cspell/dict-vue-2.0.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/node-fetch-2.6.2" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.1" @@ -91764,9 +91693,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -91774,7 +91703,7 @@ in sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" sources."@babel/helper-compilation-targets-7.18.9" - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-create-regexp-features-plugin-7.18.6" sources."@babel/helper-define-polyfill-provider-0.3.2" sources."@babel/helper-environment-visitor-7.18.9" @@ -91797,7 +91726,7 @@ in sources."@babel/helper-wrap-function-7.18.11" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.18.10" @@ -91837,7 +91766,7 @@ in sources."@babel/plugin-transform-block-scoping-7.18.9" sources."@babel/plugin-transform-classes-7.18.9" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -91872,10 +91801,10 @@ in sources."@babel/preset-react-7.18.6" sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@blueprintjs/colors-4.1.5" - sources."@blueprintjs/core-4.8.0" + sources."@blueprintjs/core-4.9.0" sources."@blueprintjs/icons-4.4.1" sources."@deltachat/message_parser_wasm-0.4.0" sources."@deltachat/react-qr-reader-4.0.0" @@ -91909,7 +91838,7 @@ in sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-14.18.25" + sources."@types/node-14.18.26" sources."@types/prop-types-15.7.5" sources."@types/rc-1.2.1" sources."@types/react-17.0.48" @@ -91965,7 +91894,7 @@ in }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."capital-case-1.0.4" sources."chalk-2.4.2" sources."change-case-4.1.2" @@ -92024,10 +91953,10 @@ in sources."earcut-2.2.4" (sources."electron-18.3.9" // { dependencies = [ - sources."@types/node-16.11.52" + sources."@types/node-16.11.54" ]; }) - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -92601,7 +92530,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.25" + sources."@types/node-14.18.26" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -92810,7 +92739,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -92918,11 +92847,7 @@ in sources."debug-2.6.9" ]; }) - (sources."electron-packager-15.5.1" // { - dependencies = [ - sources."fs-extra-9.1.0" - ]; - }) + sources."electron-packager-15.5.2" sources."electron-rebuild-3.2.9" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" @@ -93077,7 +93002,7 @@ in sources."minimist-1.2.6" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -93200,7 +93125,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.1.2" sources."ssri-9.0.1" sources."string-width-4.2.3" @@ -93290,21 +93215,21 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-3.2.0.tgz"; - sha512 = "ceJSyC2s1VCIqyzGkHeJkWBq/85QXaHM+0rZ1lRRtmcK9CsfRDyLSIZ7KJDZhPdIRUXBgBkdcOAW3AIu/yO/ew=="; + url = "https://registry.npmjs.org/emoj/-/emoj-3.3.0.tgz"; + sha512 = "MTy+wgr5KjRbcFplusJBYQIRuwmJaX+pnOq29Zo5rkLNBEvpUkDMOOXKZa6m992hGEBh9FG6h/DDzhqmCJ+a0A=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -93328,16 +93253,16 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-proposal-object-rest-spread-7.18.9" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-parameters-7.18.8" sources."@babel/plugin-transform-react-jsx-7.18.10" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -93367,7 +93292,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -93396,7 +93321,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -93561,7 +93486,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -93662,18 +93587,18 @@ in }) sources."@fluentui/date-time-utilities-8.5.2" sources."@fluentui/dom-utilities-2.2.2" - sources."@fluentui/font-icons-mdl2-8.4.8" - sources."@fluentui/foundation-legacy-8.2.15" + sources."@fluentui/font-icons-mdl2-8.4.9" + sources."@fluentui/foundation-legacy-8.2.16" sources."@fluentui/keyboard-key-0.4.2" sources."@fluentui/merge-styles-8.5.3" - sources."@fluentui/react-8.90.1" - sources."@fluentui/react-focus-8.8.0" - sources."@fluentui/react-hooks-8.6.7" + sources."@fluentui/react-8.90.2" + sources."@fluentui/react-focus-8.8.1" + sources."@fluentui/react-hooks-8.6.8" sources."@fluentui/react-portal-compat-context-9.0.1" sources."@fluentui/react-window-provider-2.2.2" sources."@fluentui/set-version-8.2.2" - sources."@fluentui/style-utilities-8.7.7" - sources."@fluentui/theme-2.6.12" + sources."@fluentui/style-utilities-8.7.8" + sources."@fluentui/theme-2.6.13" sources."@fluentui/utilities-8.12.0" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ @@ -94993,7 +94918,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sqlite3-5.0.2" @@ -95294,7 +95219,7 @@ in sources."@types/mime-3.0.1" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -95610,7 +95535,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -95851,7 +95776,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96812,7 +96737,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -97529,7 +97454,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.18.12" + sources."@babel/generator-7.18.13" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.18.9" sources."@babel/helper-hoist-variables-7.18.6" @@ -97545,19 +97470,19 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.18.10" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.18.11" // { + (sources."@babel/traverse-7.18.13" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - sources."@babel/types-7.18.10" + sources."@babel/types-7.18.13" sources."@expo/apple-utils-0.0.0-alpha.31" sources."@expo/bunyan-4.0.0" sources."@expo/config-6.0.24" @@ -97645,7 +97570,7 @@ in sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.2" @@ -97825,7 +97750,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -98076,7 +98001,7 @@ in sources."duplexer3-0.1.5" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99536,9 +99461,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -99558,23 +99483,23 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-proposal-object-rest-spread-7.18.9" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-parameters-7.18.8" sources."@babel/plugin-transform-react-jsx-7.18.10" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.15" sources."@types/minimist-1.2.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -99601,7 +99526,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -99626,7 +99551,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -99759,7 +99684,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -100204,10 +100129,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.7.0"; + version = "11.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.7.0.tgz"; - sha512 = "im3oCXpxcUWqflVbBTi8bEtRHdpQqyuwsninGqvLCzY87wwkI6IR3pT4gv/xUAkA4xU4xmQQDnLlQ5XoxA4OlA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.8.0.tgz"; + sha512 = "xUKG2WygVfZbM/cRCzvmzRf5m05h3UBprZl4lMMNhVSY5Dw4o77nPTJqDAsB9N6bMvphixSN8q4mu0NhtJGx/Q=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -100215,7 +100140,7 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" @@ -100258,7 +100183,7 @@ in sources."@types/long-4.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -100303,6 +100228,7 @@ in sources."assert-plus-1.0.0" sources."ast-types-0.13.4" sources."async-3.2.4" + sources."async-lock-1.3.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -100776,7 +100702,7 @@ in sources."minimist-1.2.6" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -101336,7 +101262,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" @@ -101388,7 +101314,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -102136,13 +102062,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -102153,7 +102079,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.18.9" sources."@babel/helper-hoist-variables-7.18.6" @@ -102174,14 +102100,14 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-syntax-typescript-7.18.6" sources."@babel/plugin-transform-typescript-7.18.12" sources."@babel/preset-typescript-7.18.6" sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -102214,7 +102140,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -102242,7 +102168,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -102306,7 +102232,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -102729,7 +102655,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.1" @@ -103078,7 +103004,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -103487,7 +103413,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -103859,7 +103785,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -104342,9 +104268,9 @@ in sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/polyfill-7.12.1" - sources."@babel/types-7.18.10" + sources."@babel/types-7.18.13" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" sources."@graphql-tools/batch-execute-8.5.3" sources."@graphql-tools/delegate-9.0.3" @@ -104365,7 +104291,7 @@ in sources."@peculiar/asn1-schema-2.3.0" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.0" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.3" sources."@whatwg-node/fetch-0.2.9" @@ -104606,7 +104532,7 @@ in sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.9" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.3" sources."@whatwg-node/fetch-0.2.9" @@ -105606,7 +105532,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -106005,7 +105931,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -106394,7 +106320,7 @@ in sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.25" + sources."@types/node-14.18.26" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -106404,7 +106330,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1199.0" + sources."aws-sdk-2.1200.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -107114,7 +107040,7 @@ in sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."prismjs-1.28.0" + sources."prismjs-1.29.0" sources."pump-3.0.0" sources."rimraf-2.7.1" sources."safer-buffer-2.1.2" @@ -108122,7 +108048,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1199.0" // { + (sources."aws-sdk-2.1200.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-8.0.0" @@ -109019,7 +108945,7 @@ in sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; dependencies = [ - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -109989,7 +109915,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."sshpk-1.17.0" (sources."static-extend-0.1.2" // { @@ -110349,7 +110275,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -110524,13 +110450,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.18.10" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -110555,13 +110481,13 @@ in sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" sources."@babel/node-7.18.10" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-transform-react-jsx-7.18.10" sources."@babel/register-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -110654,7 +110580,7 @@ in sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-2.4.2" sources."chardet-1.4.0" sources."chownr-1.1.4" @@ -110722,7 +110648,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -110967,6 +110893,7 @@ in sources."pvutils-1.1.3" sources."qs-6.10.3" sources."query-string-6.14.1" + sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -110976,6 +110903,7 @@ in sources."regenerator-runtime-0.13.9" sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" + sources."requires-port-1.0.0" sources."resolve-1.22.1" sources."reusify-1.0.4" sources."ripemd160-2.0.2" @@ -111045,16 +110973,17 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tough-cookie-4.0.0" + sources."tough-cookie-4.1.0" sources."tr46-0.0.3" sources."tslib-2.4.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-is-1.6.18" sources."unbox-primitive-1.0.2" - sources."universalify-0.1.2" + sources."universalify-0.2.0" sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.5" + sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."v8flags-3.2.0" @@ -111859,8 +111788,8 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.2.1" - sources."@nrwl/cli-14.5.8" - sources."@nrwl/tao-14.5.8" + sources."@nrwl/cli-14.5.9" + sources."@nrwl/tao-14.5.9" sources."@octokit/auth-token-3.0.1" sources."@octokit/core-4.0.5" (sources."@octokit/endpoint-7.0.1" // { @@ -112221,7 +112150,7 @@ in }) sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -112285,7 +112214,7 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-14.5.8" // { + (sources."nx-14.5.9" // { dependencies = [ sources."chalk-4.1.0" sources."cli-spinners-2.6.1" @@ -112414,7 +112343,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-1.0.1" sources."split2-3.2.2" sources."ssri-9.0.1" @@ -113440,7 +113369,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -113728,7 +113657,7 @@ in sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-3.0.0" + sources."ini-3.0.1" sources."js-yaml-4.1.0" sources."jsonc-parser-3.1.0" sources."linkify-it-4.0.1" @@ -114346,7 +114275,7 @@ in sha512 = "pE81Zfvni1qMAhqW4RkpwJ2L7Y5OFs+svSWq6cW5IQHWR8Dd8BBZL4p93GgqiVoLPTJ2heGVBKZFsgA2RPR6ng=="; }; dependencies = [ - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."balanced-match-1.0.2" @@ -114737,7 +114666,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-21.0.0" @@ -115203,7 +115132,7 @@ in sources."minimatch-3.1.2" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -115504,7 +115433,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."sshpk-1.17.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -115705,7 +115634,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -116215,7 +116144,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sshpk-1.17.0" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -116359,7 +116288,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -116791,7 +116720,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-1.0.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -116898,7 +116827,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -117061,7 +116990,7 @@ in sources."minimist-1.2.6" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -117157,7 +117086,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."ssri-9.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -117165,7 +117094,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-6.1.11" sources."to-regex-range-5.0.1" - sources."type-fest-2.18.1" + sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -117397,19 +117326,12 @@ in sources."fast-glob-3.2.7" ]; }) - (sources."@stoplight/spectral-core-1.13.0" // { - dependencies = [ - sources."@stoplight/better-ajv-errors-1.0.1" - sources."@stoplight/json-3.18.1" - sources."@stoplight/types-13.2.0" - ]; - }) + sources."@stoplight/spectral-core-1.13.1" sources."@stoplight/spectral-formats-1.2.0" sources."@stoplight/spectral-functions-1.7.1" - (sources."@stoplight/spectral-parsers-1.0.1" // { + (sources."@stoplight/spectral-parsers-1.0.2" // { dependencies = [ - sources."@stoplight/json-3.17.0" - sources."@stoplight/types-12.3.0" + sources."@stoplight/yaml-4.2.3" ]; }) sources."@stoplight/spectral-ref-resolver-1.0.1" @@ -117426,12 +117348,7 @@ in sources."@stoplight/types-12.5.0" ]; }) - (sources."@stoplight/spectral-rulesets-1.11.2" // { - dependencies = [ - sources."@stoplight/better-ajv-errors-1.0.1" - sources."@stoplight/types-12.5.0" - ]; - }) + sources."@stoplight/spectral-rulesets-1.11.3" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" @@ -117448,7 +117365,7 @@ in sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.11" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.0" @@ -117844,14 +117761,14 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."json5-2.2.1" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -117863,7 +117780,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-create-regexp-features-plugin-7.18.6" (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ @@ -117890,7 +117807,7 @@ in sources."@babel/helper-wrap-function-7.18.11" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.18.10" @@ -117931,7 +117848,7 @@ in sources."@babel/plugin-transform-block-scoping-7.18.9" sources."@babel/plugin-transform-classes-7.18.9" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -117967,8 +117884,8 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -118101,7 +118018,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -118238,7 +118155,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -118993,7 +118910,7 @@ in ]; }) sources."@parcel/workers-2.7.0" - sources."@swc/helpers-0.4.7" + sources."@swc/helpers-0.4.9" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abortcontroller-polyfill-1.7.3" @@ -119004,7 +118921,7 @@ in sources."browserslist-4.21.3" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -119035,7 +118952,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -119731,7 +119648,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -120602,10 +120519,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.9.3"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.9.3.tgz"; - sha512 = "0hpAD1vtILw0i9gTN4ffagnScWMW9/avfZIKllBUd++fAvCss+hVgPPDd0HS9XcOT675gid4H9esGkbLdaFy+w=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.9.4.tgz"; + sha512 = "eZG33kdDFmIzBZoSRguEHVLtnHdJTvfP6wm53SyBt4Mqzbro9eIaQcEcB4qfJCGMaLvPegG2MQxD2EiArALaJA=="; }; buildInputs = globalBuildInputs; meta = { @@ -120912,9 +120829,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - sources."@babel/core-7.18.10" - (sources."@babel/generator-7.18.12" // { + sources."@babel/compat-data-7.18.13" + sources."@babel/core-7.18.13" + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -120932,10 +120849,10 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.1.1" @@ -120956,7 +120873,7 @@ in sources."browserslist-4.21.3" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -120969,7 +120886,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.0" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -121965,13 +121882,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.18.10" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.10" // { + sources."@babel/compat-data-7.18.13" + (sources."@babel/core-7.18.13" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.12" // { + (sources."@babel/generator-7.18.13" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -121983,7 +121900,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-create-regexp-features-plugin-7.18.6" (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ @@ -122010,7 +121927,7 @@ in sources."@babel/helper-wrap-function-7.18.11" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.18.10" @@ -122052,7 +121969,7 @@ in sources."@babel/plugin-transform-block-scoping-7.18.9" sources."@babel/plugin-transform-classes-7.18.9" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -122098,8 +122015,8 @@ in sources."@babel/register-7.18.9" sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -122110,7 +122027,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -122303,7 +122220,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -122524,7 +122441,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -123830,7 +123747,7 @@ in sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."domexception-4.0.0" - sources."dompurify-2.3.10" + sources."dompurify-2.3.11" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -123857,17 +123774,20 @@ in sources."prelude-ls-1.1.2" sources."psl-1.9.0" sources."punycode-2.1.1" + sources."querystringify-2.2.0" sources."require-directory-2.1.1" + sources."requires-port-1.0.0" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."symbol-tree-3.2.4" - sources."tough-cookie-4.0.0" + sources."tough-cookie-4.1.0" sources."tr46-3.0.0" sources."type-check-0.3.2" - sources."universalify-0.1.2" + sources."universalify-0.2.0" + sources."url-parse-1.5.10" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-3.0.0" sources."webidl-conversions-7.0.0" @@ -123903,7 +123823,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.18.12" + sources."@babel/generator-7.18.13" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.18.9" @@ -123913,11 +123833,11 @@ in sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/runtime-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.11" - sources."@babel/types-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" @@ -123929,11 +123849,11 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.15" sources."@redocly/ajv-8.6.5" - sources."@redocly/openapi-core-1.0.0-beta.107" + sources."@redocly/openapi-core-1.0.0-beta.108" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/json-schema-7.0.11" - sources."@types/node-14.18.25" + sources."@types/node-14.18.26" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -124034,7 +123954,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.10" + sources."dompurify-2.3.11" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" (sources."elliptic-6.5.4" // { @@ -124171,7 +124091,7 @@ in sources."polished-4.2.2" sources."postcss-value-parser-4.2.0" sources."prepend-http-2.0.0" - sources."prismjs-1.28.0" + sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.8.1" @@ -124432,7 +124352,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -124856,14 +124776,14 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.33.1" - sources."@typescript-eslint/parser-5.33.1" - sources."@typescript-eslint/scope-manager-5.33.1" - sources."@typescript-eslint/type-utils-5.33.1" - sources."@typescript-eslint/types-5.33.1" - sources."@typescript-eslint/typescript-estree-5.33.1" - sources."@typescript-eslint/utils-5.33.1" - sources."@typescript-eslint/visitor-keys-5.33.1" + sources."@typescript-eslint/eslint-plugin-5.34.0" + sources."@typescript-eslint/parser-5.34.0" + sources."@typescript-eslint/scope-manager-5.34.0" + sources."@typescript-eslint/type-utils-5.34.0" + sources."@typescript-eslint/types-5.34.0" + sources."@typescript-eslint/typescript-estree-5.34.0" + sources."@typescript-eslint/utils-5.34.0" + sources."@typescript-eslint/visitor-keys-5.34.0" sources."@vscode/test-electron-2.1.5" sources."acorn-8.8.0" sources."acorn-jsx-5.3.2" @@ -125505,7 +125425,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."type-fest-2.18.1" + sources."type-fest-2.19.0" sources."update-check-1.5.4" sources."uri-js-4.4.1" sources."vary-1.1.2" @@ -125563,7 +125483,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.184" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -125591,7 +125511,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1199.0" // { + (sources."aws-sdk-2.1200.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -126731,7 +126651,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" @@ -126880,7 +126800,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -127982,7 +127902,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1199.0" // { + (sources."aws-sdk-2.1200.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -128567,7 +128487,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.17.0" // { @@ -128970,7 +128890,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" @@ -129161,7 +129081,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -129248,7 +129168,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -130542,7 +130462,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -130926,7 +130846,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -131299,7 +131219,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -131683,7 +131603,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -132029,7 +131949,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -133042,7 +132962,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -133509,7 +133429,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -134407,7 +134327,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.2" sources."ajv-6.12.6" @@ -134906,7 +134826,7 @@ in sources."semver-7.3.7" sources."temp-dir-2.0.0" sources."tempy-3.0.0" - sources."type-fest-2.18.1" + sources."type-fest-2.19.0" sources."unique-string-3.0.0" sources."universalify-2.0.0" sources."vscode-jsonrpc-8.0.2" @@ -134987,7 +134907,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-16.11.52" + sources."@types/node-16.11.54" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -135326,7 +135246,7 @@ in sources."@types/debug-4.1.7" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-1.1.1" @@ -135356,7 +135276,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-3.0.0" + sources."ini-3.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-empty-1.2.0" @@ -135635,10 +135555,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.1.0"; + version = "28.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.1.0.tgz"; - sha512 = "AorSrhLIpAIUxHdeEsL4LUp5WHE4wMzlul7ACA8WUBGx1oPyy4EkC6XCszQNsmmVhOPpIQzWX7Xg5ABJVto9RQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.1.1.tgz"; + sha512 = "/9yps6Ybfloq01HnZWVw/dK+0y3ZrZ2TnxrwjRuT2DxApicznmKbRZvbXnRE6PtOgW8uHytFKL1m7LqnszhGYg=="; }; dependencies = [ sources."@edge-runtime/format-1.1.0-beta.27" @@ -135656,15 +135576,15 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@ts-morph/common-0.11.1" sources."@types/json-schema-7.0.11" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@vercel/build-utils-5.3.1" sources."@vercel/go-2.2.0" sources."@vercel/hydrogen-0.0.14" - sources."@vercel/next-3.1.19" + sources."@vercel/next-3.1.20" sources."@vercel/nft-0.21.0" sources."@vercel/node-2.5.8" sources."@vercel/node-bridge-3.0.0" - sources."@vercel/python-3.1.9" + sources."@vercel/python-3.1.10" sources."@vercel/redwood-1.0.18" sources."@vercel/remix-1.0.19" (sources."@vercel/routing-utils-2.0.2" // { @@ -136394,7 +136314,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -136434,7 +136354,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.10.0" @@ -136984,7 +136904,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -137666,7 +137586,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -138042,10 +137962,12 @@ in sources."prelude-ls-1.1.2" sources."psl-1.9.0" sources."punycode-2.1.1" + sources."querystringify-2.2.0" sources."raf-3.4.1" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" + sources."requires-port-1.0.0" sources."rgbcolor-1.0.1" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" @@ -138066,15 +137988,16 @@ in sources."svg2img-0.9.4" sources."symbol-tree-3.2.4" sources."tar-6.1.11" - (sources."tough-cookie-4.0.0" // { + (sources."tough-cookie-4.1.0" // { dependencies = [ - sources."universalify-0.1.2" + sources."universalify-0.2.0" ]; }) sources."tr46-0.0.3" sources."tspan-0.4.0" sources."type-check-0.3.2" sources."universalify-2.0.0" + sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" @@ -138154,7 +138077,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" @@ -138192,7 +138115,7 @@ in (sources."boxen-7.0.0" // { dependencies = [ sources."chalk-5.0.1" - sources."type-fest-2.18.1" + sources."type-fest-2.19.0" ]; }) sources."brace-expansion-1.1.11" @@ -138329,7 +138252,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.1.1" + sources."fast-redact-3.1.2" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" @@ -138660,7 +138583,7 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-2.0.1" + sources."thread-stream-2.1.0" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" @@ -138751,7 +138674,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -138775,10 +138698,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.21.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001381" + sources."caniuse-lite-1.0.30001382" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.225" + sources."electron-to-chromium-1.4.227" sources."enhanced-resolve-5.10.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -138909,7 +138832,7 @@ in sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" @@ -139221,7 +139144,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -140309,7 +140232,7 @@ in sources."lru-cache-7.14.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ - sources."minipass-fetch-2.1.1" + sources."minipass-fetch-2.1.2" ]; }) sources."mkdirp-1.0.4" @@ -140533,7 +140456,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."sprintf-js-1.1.2" sources."sshpk-1.17.0" sources."ssri-8.0.1" @@ -140792,7 +140715,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-18.7.9" + sources."@types/node-18.7.11" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.1" sources."braces-3.0.2" diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 5ce8bfcfb81d..e001e71f3454 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -39,7 +39,7 @@ final: prev: { }; "@hyperspace/cli" = prev."@hyperspace/cli".override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; buildInputs = [ final.node-gyp-build ]; postInstall = ''wrapProgram "$out/bin/hyp" --prefix PATH : ${ lib.makeBinPath [ nodejs ] }''; }; @@ -63,7 +63,7 @@ final: prev: { mdctl-cli = final."@medable/mdctl-cli"; autoprefixer = prev.autoprefixer.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/autoprefixer" \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules @@ -74,7 +74,7 @@ final: prev: { }; aws-azure-login = prev.aws-azure-login.override (oldAttrs: { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 ''; @@ -100,7 +100,7 @@ final: prev: { }; bower2nix = prev.bower2nix.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]} @@ -109,7 +109,7 @@ final: prev: { }; carbon-now-cli = prev.carbon-now-cli.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 ''; @@ -151,7 +151,7 @@ final: prev: { }); fast-cli = prev.fast-cli.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 ''; @@ -171,7 +171,7 @@ final: prev: { }); graphql-language-service-cli = prev.graphql-language-service-cli.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/graphql-lsp" \ --prefix NODE_PATH : ${final.graphql}/lib/node_modules @@ -227,7 +227,7 @@ final: prev: { }; makam = prev.makam.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postFixup = '' wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} ${ @@ -255,7 +255,7 @@ final: prev: { if stdenv.isDarwin then {} else { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 ''; @@ -275,7 +275,7 @@ final: prev: { }; node-gyp = prev.node-gyp.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. # This is important when build nodejs packages in sandbox. postInstall = '' @@ -294,7 +294,7 @@ final: prev: { }; node2nix = prev.node2nix.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; # We need to use master because of a fix that replaces git:// url to https://. src = fetchFromGitHub { owner = "svanderburg"; @@ -316,7 +316,7 @@ final: prev: { }; pnpm = prev.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; preRebuild = '' sed 's/"link:/"file:/g' --in-place package.json @@ -335,7 +335,7 @@ final: prev: { }; postcss-cli = prev.postcss-cli.override (oldAttrs: { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules \ @@ -354,7 +354,7 @@ final: prev: { # version. Then change the correct hash to this package. The PR should hold # two commits: one for the engines and the other one for the node package. prisma = prev.prisma.override rec { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; inherit (pkgs.prisma-engines) version; @@ -382,7 +382,7 @@ final: prev: { # tries to install purescript npmFlags = "--ignore-scripts"; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/pulp" --suffix PATH : ${lib.makeBinPath [ pkgs.purescript @@ -392,7 +392,7 @@ final: prev: { reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 ''; @@ -414,7 +414,7 @@ final: prev: { tailwindcss = prev.tailwindcss.override { plugins = [ ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' nodePath="" for p in "$out" "${final.postcss}" $plugins; do @@ -439,7 +439,7 @@ final: prev: { }; tedicross = prev."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \ --add-flags "$out/lib/node_modules/tedicross/main.js" @@ -480,7 +480,7 @@ final: prev: { }; ts-node = prev.ts-node.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ts-node" \ --prefix NODE_PATH : ${final.typescript}/lib/node_modules @@ -488,7 +488,7 @@ final: prev: { }; tsun = prev.tsun.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/tsun" \ --prefix NODE_PATH : ${final.typescript}/lib/node_modules @@ -496,7 +496,7 @@ final: prev: { }; typescript-language-server = prev.typescript-language-server.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/typescript-language-server" \ --suffix PATH : ${lib.makeBinPath [ final.typescript ]} @@ -554,7 +554,7 @@ final: prev: { }; yaml-language-server = prev.yaml-language-server.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/yaml-language-server" \ --prefix NODE_PATH : ${final.prettier}/lib/node_modules diff --git a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix index a2f3b32b7fcc..6dce840e914c 100644 --- a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "atdgen-codec-runtime"; - version = "2.9.1"; + version = "2.10.0"; src = fetchurl { url = "https://github.com/ahrefs/atd/releases/download/${version}/atdts-${version}.tbz"; - sha256 = "sha256-OdwaUR0Ix0Oz8NDm36nIyvIRzF+r/pKgiej1fhcOmuQ="; + sha256 = "sha256-d9J0CaTp2sQbnKLp6mCDbGwYAIsioVer7ftaLSSFCZg="; }; meta = { diff --git a/pkgs/development/ocaml-modules/atdgen/runtime.nix b/pkgs/development/ocaml-modules/atdgen/runtime.nix index 0fc98a1f66be..0006e8613c58 100644 --- a/pkgs/development/ocaml-modules/atdgen/runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/runtime.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, atdgen-codec-runtime, biniou, camlp-streams, yojson }: +{ buildDunePackage, atdgen-codec-runtime, biniou, yojson }: buildDunePackage rec { pname = "atdgen-runtime"; @@ -6,7 +6,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ biniou camlp-streams yojson ]; + propagatedBuildInputs = [ biniou yojson ]; meta = atdgen-codec-runtime.meta // { description = "Runtime library for code generated by atdgen"; diff --git a/pkgs/development/ocaml-modules/elpi/atd_2_10.patch b/pkgs/development/ocaml-modules/elpi/atd_2_10.patch new file mode 100644 index 000000000000..3f341a3fa4b4 --- /dev/null +++ b/pkgs/development/ocaml-modules/elpi/atd_2_10.patch @@ -0,0 +1,13 @@ +diff --git a/src/elpi_trace_elaborator.ml b/src/elpi_trace_elaborator.ml +index ca13114d..093e7593 100644 +--- a/src/elpi_trace_elaborator.ml ++++ b/src/elpi_trace_elaborator.ml +@@ -664,6 +664,6 @@ let main = + + let cards = Trace.cards steps ~stack_frames ~aggregated_goal_success ~goal_text ~goal_attempts in + +- let ob = Bi_outbuf.create_channel_writer stdout in ++ let ob = Buffer.create 17 in + write_trace ob cards; +- Bi_outbuf.flush_channel_writer ob ++ Buffer.output_buffer stdout ob diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index b9a81a6c9d9c..428e42682329 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -31,6 +31,9 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; + patches = lib.optional (versionAtLeast version "1.16" || version == "dev") + ./atd_2_10.patch; + minimalOCamlVersion = "4.04"; buildInputs = [ perl ncurses ] diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 3e25ba37fd1a..7bd875e475ec 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -19,7 +19,8 @@ buildDunePackage rec { buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = lib.versionAtLeast ocaml.version "4.08" + && lib.versionOlder yojson.version "2.0"; preCheck = '' # some run.t files check the content of patchShebangs-ed scripts, so patch diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index d82869c4392d..e9cd39827b93 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -1,6 +1,6 @@ { lib , buildDunePackage -, fetchFromGitHub +, fetchzip , cstruct , mirage-crypto , alcotest @@ -10,13 +10,12 @@ buildDunePackage rec { pname = "pbkdf"; version = "1.2.0"; - src = fetchFromGitHub { - owner = "abeaumont"; - repo = "ocaml-pbkdf"; - rev = version; + src = fetchzip { + url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; + minimalOCamlVersion = "4.07"; propagatedBuildInputs = [ cstruct mirage-crypto ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 03b01c437766..38960dceb5e3 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,17 +1,16 @@ -{ lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }: +{ lib, fetchurl, buildDunePackage, cppo, seq }: buildDunePackage rec { pname = "yojson"; - version = "1.7.0"; - useDune2 = true; + version = "2.0.2"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5"; + sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs="; }; nativeBuildInputs = [ cppo ]; - propagatedBuildInputs = [ easy-format biniou ]; + propagatedBuildInputs = [ seq ]; meta = with lib; { description = "An optimized parsing and printing library for the JSON format"; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 618510363683..c5040b0feace 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -3,6 +3,7 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -11,14 +12,16 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.3.0"; - disabled = pythonOlder "3.6"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-Kn2hP0mdnC4+Lk8wsTznC23CsYLYKhya+HlHox1Fo2o="; + hash = "sha256-NnDpSOEIqPuPLIr0Ty6yjrs9WRKyhykcdyiRPB/cHEw="; }; postPatch = '' @@ -30,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + orjson ]; checkInputs = [ @@ -39,7 +43,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "accuweather" ]; + pythonImportsCheck = [ + "accuweather" + ]; meta = with lib; { description = "Python wrapper for getting weather data from AccuWeather servers"; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 0cb34b22bd0b..f9434454df16 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.27.1"; + version = "3.27.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-HAymQ08RauE8oATYzKE+UaqMsmNK3O+VyLLd6w/jPFc="; + hash = "sha256-bsehvoX625Lr+5/ieYnIBUMUpkCv3mlDDCCf2UyXsMk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 30c524ce9bce..f90cc4683203 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.14"; + version = "9.2.15"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-Axjyqn1TtZbYdgaC6hOhIQM3FBs0a1oHNK8wLuWQLHM="; + hash = "sha256-CXJ9UVTrJzXumDJ6wghDbxVfZo9ZC67qBpz8B5D0DLo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 216b76490634..4bb6a9305444 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.42"; + version = "0.1.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-pCpMAG6QTKjJsLecTtBNrgCtUALsNFLrurFoPnrsGyE="; + hash = "sha256-P0o8LhjTzhfJerunTcadvYQOZMd7WbfnKbeAEhXFP1Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index 41e96f26cc52..1ad6c354a7fe 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "v${version}"; - hash = "sha256-zaHetU0ZG3xkYrO6qA4o+NX8V5td/E08tPEohEwMjh0="; + hash = "sha256-jZBs1h+01Mbwpvy3hg5/DEIU5EPKW4P/iMqp4eb4EpM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 958467823dc1..5c88d8f8591a 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.9"; + version = "2.0.10"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vsMQG664ySMQfdl4tGJKMY0MZXVl39QaFxu7kMtZWCM="; + sha256 = "sha256-Me0BvmCfj9bA7TXUHXLYe9a+d7nFnm7RpNVGtAzkBZM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix new file mode 100644 index 000000000000..fbaae43b9789 --- /dev/null +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -0,0 +1,46 @@ +{ lib +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "airthings-ble"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "vincegio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-E/+ObY/kO52J0nbyHGsBlqY5OYlnwf3ujAHEd1pEKvo="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "airthings_ble" + ]; + + meta = with lib; { + description = "Library for Airthings BLE devices"; + homepage = "https://github.com/vincegio/airthings-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index dde5372e1870..3e2de613cc25 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,16 +46,16 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.14"; + version = "9.2.15"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-lxquiow2hI0xqdPLyZTZtxIo5nR60OtJV/kf6ukGF4c="; + hash = "sha256-9KWk4uB7VlYsnQbDCRgnVkis0UAZfiI2xH9cAD1Dd7M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 651404e7fedc..92a81589233f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -2,26 +2,24 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, nose , pythonOlder }: buildPythonPackage rec { pname = "archinfo"; - version = "9.2.14"; + version = "9.2.15"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-kWZ5z9Tn0SAqrGP4gtGfPny+kj/2ibSdTwp+0RCx40s="; + hash = "sha256-K9EAyCvwgWhiZ+rkPKPGBr3lWYIIRCf0FAzPjIjrcU8="; }; checkInputs = [ - nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index bba82425cc05..9168d9dcb43f 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -6,17 +6,21 @@ , prompt-toolkit , pyparsing , python +, pythonOlder }: buildPythonPackage rec { pname = "asn1tools"; - version = "0.163.0"; + version = "0.164.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "eerimoq"; repo = "asn1tools"; - rev = "v${version}"; - sha256 = "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; + rev = version; + hash= "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; }; propagatedBuildInputs = [ @@ -30,7 +34,9 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - pythonImportsCheck = [ "asn1tools" ]; + pythonImportsCheck = [ + "asn1tools" + ]; meta = with lib; { description = "ASN.1 parsing, encoding and decoding"; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 039470a7b3e8..1526477644b1 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S6ZTUGBLCZ4gaiKTxC8xa4KDBl/zoZQ2vlFuXdcwLmk="; + hash = "sha256-PRYu3PTmSg25DiSuLnv1tp1cOZsXHGTmxRA2V39ab4k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index d053c00f8662..c2e26fcac449 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "0.3.8"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-J5i9r2bZtiEOqkQJ6yhTWboqvgo2gsi8z6XeyxtHwSw="; + hash = "sha256-pL9b3ocjx81tU+U6C1kOe28HM23dsuE7hkoOUV4YBAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 78457c2da6ce..bc755166221b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.14"; + version = "9.2.15"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-802ToJGxwJSFcnl3suQMPNz0/7HnqvqxCpy9u7iU6EE="; + hash = "sha256-3v5te+j3I4yzxoBO8kY8VGLCrWfb1iOz9GHzun1DT0I="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { postPatch = '' # Use upstream z3 implementation substituteInPlace setup.cfg \ - --replace "z3-solver >= 4.8.5.0" "" + --replace "z3-solver == 4.10.2.0" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 1932856fd956..e2cf9dac779f 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.14"; + version = "9.2.15"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -31,13 +31,13 @@ buildPythonPackage rec { inherit version; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ueR5reEmaI9drFMQn/CBHCW7DmsTWWYi1zCNaUQ2y7g="; + hash = "sha256-vGIthytW0gZy0X2OXuFwdBnPuvcWkV47FeaXZY8FCVc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 81bcf03130e1..c93e5d21823e 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -10,6 +10,7 @@ , black , magic-wormhole , mitmproxy +, typer }: buildPythonPackage rec { @@ -31,7 +32,7 @@ buildPythonPackage rec { ]; passthru.tests = { - inherit black flask magic-wormhole mitmproxy; + inherit black flask magic-wormhole mitmproxy typer; }; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index 6f693f369cda..9fdc60dd7f4b 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.60"; + version = "1.2.63"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DTQTsv/59895UTsMmqxYtSfFosUWPRx8wMT4zKHQ9Oc="; + hash = "sha256-JId7lxdSnU1BQ6AoGj2rB8Z+9QOK5/5IhjluCrDBQHg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix index ac470b83f7b2..0bdc795159ca 100644 --- a/pkgs/development/python-modules/daemonocle/default.nix +++ b/pkgs/development/python-modules/daemonocle/default.nix @@ -4,27 +4,44 @@ , click , psutil , pytestCheckHook +, lsof }: buildPythonPackage rec { pname = "daemonocle"; - version = "1.0.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "jnrbsn"; repo = "daemonocle"; rev = "v${version}"; - hash = "sha256-kDCbosXTIffuCzHcReXhiW4YPbxDW3OPnTbMC/EGJrM="; + hash = "sha256-K+IqpEQ4yhfSguPPm2Ult3kGNO/9H56B+kD5ntaCZdk="; }; - propagatedBuildInputs = [ click psutil ]; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + click + psutil + ]; + + checkInputs = [ + pytestCheckHook + lsof + ]; # One third of the tests fail on the sandbox with # "psutil.NoSuchProcess: no process found with pid 0". - doCheck = false; - disabledTests = [ "sudo" ]; - pythonImportsCheck = [ "daemonocle" ]; + disabledTests = [ + "sudo" + "test_chrootdir_without_permission" + "test_uid_and_gid_without_permission" + "test_multi_daemon" + "test_multi_daemon_action_worker_id" + "test_exec_worker" + ]; + + pythonImportsCheck = [ + "daemonocle" + ]; meta = with lib; { description = "A Python library for creating super fancy Unix daemons"; @@ -36,7 +53,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/jnrbsn/daemonocle"; license = licenses.mit; - maintainers = [ maintainers.AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 1c8cee1d7186..3888020ccd22 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debian-inspector"; - version = "30.0.0"; + version = "31.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "debian_inspector"; inherit version; - hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; + hash = "sha256-RglPlTRksmm7CYVere7jySy2tIegv6JuulN7Usw9a0c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 83c89b53c97d..7936df01bd01 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -1,13 +1,14 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - six, - requests, - django, - boto3, - python, - mock, +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, requests +, django +, boto3 +, python +, mock +, pytestCheckHook +, pytest-django }: buildPythonPackage rec { @@ -28,20 +29,26 @@ buildPythonPackage rec { boto3 ]; - checkInputs = [ mock ]; - checkPhase = '' - substituteInPlace setup.py --replace "tests_require=[" "tests_require=[], #" - export CONTINUOUS_INTEGRATION=1 - export ANYMAIL_SKIP_TESTS="sparkpost" - ${python.interpreter} setup.py test - ''; + checkInputs = [ + pytestCheckHook + pytest-django + mock + ]; + + disabledTests = [ + # Require networking + "test_debug_logging" + "test_no_debug_logging" + ]; + + pythonImportsCheck = [ "anymail" ]; + + DJANGO_SETTINGS_MODULE = "tests.test_settings.settings_3_2"; - # this package allows multiple email backends - # sparkpost is missing because it's not packaged yet meta = with lib; { description = "Django email backends and webhooks for Mailgun"; homepage = "https://github.com/anymail/django-anymail"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index bdb10688924d..b8d76ebe7b4a 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -5,6 +5,8 @@ , funcy , redis , six +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { @@ -23,14 +25,33 @@ buildPythonPackage rec { six ]; - # tests need a redis server - # pythonImportsCheck not possible since DJANGO_SETTINGS_MODULE needs to be set - doCheck = false; + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + disabledTests = [ + # Tests require networking + "test_cached_as" + "test_invalidation_signal" + "test_queryset" + "test_queryset_empty" + "test_lock" + "test_context_manager" + "test_decorator" + "test_in_transaction" + "test_nested" + "test_unhashable_args" + "test_db_agnostic_by_default" + "test_db_agnostic_disabled" + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { description = "A slick ORM cache with automatic granular event-driven invalidation for Django"; homepage = "https://github.com/Suor/django-cacheops"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 10cb2d132aa8..2b3b41135b61 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t7E8kTtbb24FyICv6uGpGxR6W8EfuVB5FR2cyItgalA="; + sha256 = "sha256-wAq8uNUkBnOQpmUYz80yaDuHrTzGINWRNkn8dwe4CDM="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 77ed6401f65c..74b0fa28b6bd 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -5,6 +5,7 @@ , geopy , imageio , lxml +, pandas , pillow , pytestCheckHook , python-dateutil @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.24"; + version = "0.5.25"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - sha256 = "sha256-R6X4TY0yrfSj30FXHmHHK6QBHAT3pb+UXjjZ3SW1SP8="; + sha256 = "sha256-UF04TAhgeb76bYisNYOAraw59K54WkX9a8QOtHywMTQ="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { geopy imageio lxml + pandas pillow python-dateutil voluptuous diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index e399686c4b7a..ab5e1f579fc8 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.18"; + version = "1.5.22"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Ur12ewTfJyUUzrQyTP8qydzjxnHFcJDAw9xChN+mZ1Y="; + sha256 = "sha256-pJGyfo+7Sz4IxurkAo+51veN+o6gHAqBor5SLXERNdo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 7f0ac90533c2..bc380cd8dbcb 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -10,6 +10,11 @@ , werkzeug , pytestCheckHook , pythonOlder + # used in passthru.tests +, flask-limiter +, flask-restful +, flask-restx +, moto }: buildPythonPackage rec { @@ -35,6 +40,10 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.tests = { + inherit flask-limiter flask-restful flask-restx moto; + }; + meta = with lib; { homepage = "https://flask.palletsprojects.com/"; description = "The Python micro framework for building web applications"; diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index a670b4a9ba16..c7c05e4f322a 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "4.0"; + version = "4.1"; format = "pyproject"; nativeBuildInputs = [ pdm-pep517 ]; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MTq0djhFp/cEx0Ezt5EaMz3MzrAWjxZ0HQSkfFuasWY="; + sha256 = "sha256-efEJ5rJXR7L0Lyh1loXC4h2ciGfXCJGD6iKyQuEph+E="; }; } diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 86e5e03387e5..dd241d5ff822 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-T7Z+xipTuE7IE9v+ZmiMvP5g8a/MU0ExnaE11DRjvpM="; + sha256 = "sha256-IBEy19iouYAHIZwc/bnMgmHLrbfZjLni0Ne4o0I6FNg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index e196f0ec09d8..4b24bc41d863 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,21 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, docutils, installShellFiles -, google-api-python-client, simplejson, oauth2client, setuptools, xdg +{ lib +, buildPythonPackage +, fetchFromGitLab +, pythonOlder +, docutils +, installShellFiles +, poetry-core +, google-api-python-client +, simplejson +, oauth2client +, setuptools +, pyxdg }: buildPythonPackage rec { pname = "goobook"; version = "3.5.2"; - disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-i24Hh10iXFUiWVgokMs7f8ZpIVN/ZEF421tfa2ByQ4c="; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "goobook"; + repo = "goobook"; + rev = version; + sha256 = "sha256-gWmeRlte+lP7VP9gbPuMHwhVkx91wQ0GpQFQRLJ29h8="; }; - nativeBuildInputs = [ docutils installShellFiles ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools = "^62.6.0"' 'setuptools = "*"' \ + --replace 'google-api-python-client = "^1.7.12"' 'google-api-python-client = "*"' \ + --replace 'pyxdg = "^0.28"' 'pyxdg = "*"' + ''; + + nativeBuildInputs = [ + docutils + installShellFiles + poetry-core + ]; + propagatedBuildInputs = [ - google-api-python-client simplejson oauth2client setuptools xdg + google-api-python-client + simplejson + oauth2client + setuptools + pyxdg ]; postInstall = '' @@ -23,6 +52,7 @@ buildPythonPackage rec { installManPage goobook.1 ''; + # has no tests doCheck = false; pythonImportsCheck = [ "goobook" ]; @@ -34,10 +64,9 @@ buildPythonPackage rec { from the command-line and from MUAs such as Mutt. It can be used from Mutt the same way as abook. ''; - homepage = "https://pypi.python.org/pypi/goobook"; - changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst"; - license = licenses.gpl3; + homepage = "https://pypi.org/project/goobook/"; + changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst"; + license = licenses.gpl3; maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 1997d88821b3..845bb25638f5 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.53.0"; + version = "2.57.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kEs9aH4otT9N3iNrReRDxjh+FzYU6ZGD3FuKzb03DRg="; + sha256 = "sha256-7EQSVFsMWXioM7sDmTpGEhrSxwDzKvDLoj+EObP1+wI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index f1aba037ee01..8a4c8474adc2 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.9.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FCkvo0KfK7HpmGJVTN4e5zDWhA664GeBTT0V2FScCIg="; + sha256 = "sha256-7WXs+faBgyKY4pMo4e8KNnbjcysuVvQVMtRfcKIt4Ps="; }; propagatedBuildInputs = [ @@ -72,7 +72,8 @@ buildPythonPackage rec { responses urllib3 ] ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.enterprise_cert + # `cryptography` is still required on `aarch64-darwin` for `tests/crypt/*` + ++ (if (stdenv.isDarwin && stdenv.isAarch64) then [ cryptography ] else passthru.optional-dependencies.enterprise_cert) ++ passthru.optional-dependencies.reauth; pythonImportsCheck = [ @@ -80,11 +81,12 @@ buildPythonPackage rec { "google.oauth2" ]; - disabledTestPaths = [ - # Disable tests related to pyopenssl + disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Disable tests using pyOpenSSL as it does not build on M1 Macs "tests/transport/test__mtls_helper.py" "tests/transport/test_requests.py" "tests/transport/test_urllib3.py" + "tests/transport/test__custom_tls_signer.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 5378243fe1a6..85b1a7bdfa45 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pTakW1aYx5KlU8vgOXwu4kJDI4nEVi2y0YE0pTo3k30="; + hash = "sha256-im0A14OQghyYqgtkD767qG+niKQX4jpb0pm2yNBwBCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index b62326fac138..2ab2ce584277 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.11.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d/eDAp8QuXr2Zh/zk9ONeKd+SdmqXlugdpx9t1hkMIM="; + hash = "sha256-UWy6dC1a9712pxT43JNP2CAbtXUFi2olvEm1eLw+z0g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 19bac6c4b55d..ffa2e73e9acb 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kpi3RU66JEWt0guFPRtetBqn8F21qjE8kW1zc4oSBPM="; + hash = "sha256-FlR7jpj/NKJgGLjTvfGr/YusKi+FQ43dyhd6GhTjNE0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 8adc7d1b25a3..f23ee1e4f519 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-WSFulX1aN+mSW3RTukXDe0N/BsLDQX2RKjqzPUsWb2Y="; + hash = "sha256-ZabPYA56yhoKOYAgvXJLgxAv3VkmV4wiDiAYGoZ61Es="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 97d3ec13e99a..e965debbcf57 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n8LMhjyZmWnb8ALrOZkKZ8Ctlo70zjyTRF9HxJIudmQ="; + sha256 = "sha256-mKsRLljxWe6CYaWy08Gk5XvkygzoVWmu7wOIOGivmZM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 3e3a16f76ddb..a4f9e638c3d9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.14.1"; + version = "2.14.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nOwHaJxFVEi023iapg51lmTXV+sGavKjXUFOXgDPb7g="; + sha256 = "sha256-VUCQSpykLuwYrzgz3YImODesRLdr1NuSreGShX2+oEw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index c939217ccd09..1a41a3e91397 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S2gYVMAaQnK4AmHd8biofYAvxVmM7UTc/HuDPLAsDhg="; + hash = "sha256-v5ZAeRHG/LvlmL4bnETgCiYAv/nqutKpf0My78EWVJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 35e05bff0eff..0a5be25b2404 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.11.1"; + version = "2.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3IEedcFLM46M+luI3wx/Q0V4rhyGmkZyIy1oU0rHzII="; + hash = "sha256-noAGxYaQW9XBlHcHN25V/b2ScpnvjSnKdWVkAY0KbiY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 1b03d5285972..be3eeeee47a9 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.11.1"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KVLM4ytQh8260JYd3oviCattfZa73e5p5dNXQMgRKQQ="; + hash = "sha256-GYkO1gPaEFtlKRZqatwFkPZwb9rr42jmzSz/S1UoWrs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 54dd6cb837a3..bc72ce501035 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NDNDWcsEGHvcgN3PYT5GLf16Oqu8P+TRGFF6tLkwPVM="; + sha256 = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index a58768417059..3a534fa74ffc 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.9.0"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1VhEg22JMfUDeMT5/A1uX7jwqND4i0zVScFpMJKyCro="; + hash = "sha256-8TwAwl9/gq47lW+MXi5x2RlqaAs6dnQiuAZkb4oPD84="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 568cf16eed29..039a1d5c844b 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ldFvWqMTpSY2YHJ+I1vsrTiPESNoi3b055bthwwFjY4="; + hash = "sha256-U3j9ohPdZ6sTLJ/tII4HeG28h40IGDH+Ljbz/fS8WBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 133a59300215..a23716632d02 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zqsy+xrgmjsSrybBpwCfphTGGVp2AOp+ANsYPSrVfA="; + sha256 = "sha256-AohJ0TAQy3GFALvzqd4i2BiyaCzfTjMMAVIe1ZUZ5eI="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { "tests/system/test_allocate_reserve_ids.py" "tests/system/test_query.py" "tests/system/test_put.py" + "tests/system/test_read_consistency.py" "tests/system/test_transaction.py" ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 5478fa83934c..a5bf4ccfa4d5 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.8.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xidZ7EteyDUFxxXOXgSg6OUkzlIzEgnAMRledha0s/Y="; + hash = "sha256-jNsIpg5M8r7SfzldmcsAqoyKI/7pwwo/Zk7KBwdOxJQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 3a7b81e16b6d..908c1061f197 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o0q3/M8PiiIZr7swJusn21CIOKF2uCAebuavxNsA/Hg="; + hash = "sha256-PPY5DIaGkx5EXcAO04qbLf6JRPVXU450XnjE+n+v97o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 922d94c83caa..f95bcf0778c4 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iq+rOR7gMAfhn5WxfpFQ7s8MlwOxPm868DpgKg/sT/k="; + sha256 = "sha256-BgCO9G9MwSonZSZ9sAQuTurGXLTJXsCC73QalBsACRY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index ca0db441abcf..556e3ad32493 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JUrzCSON1oMVH0U1d4tfl1nGDc+IyIMOSL4PxEflDAU="; + hash = "sha256-3lcg+/ScOzWDzKdcqQaUl3wuSWR48a5F3cJoUOntWAc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index bf2af25a42bd..8070d76d4148 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.8.0"; + version = "2.8.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3SBQKRr/dpNqksC7wLNCz4Oda/i90BAZLcxN9oMYOsA="; + sha256 = "sha256-QrMYsuj9BremQGxociZRGIm/4aQRDHC7dRz6uo1PzOI="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 12b9bfd7f1ac..d5752e3205ac 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eQPmfjtWUXxrrMgRgZ+pXc6lGP5bWq1VSecaHEvSk8I="; + sha256 = "sha256-BCNpEZdpBRkRa6p8OwDoE6F70ljbSg6doG83hCnQbwM="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 0d6732392a10..8569e78818fe 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.12.0"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ySlCL0Ukppob6Iuu2+fVQjPDsAnmK1Yvbd2I8+DVylk="; + sha256 = "sha256-A1sIdkNdK4L6gb3VBApuKJ71J5N2Jq43kcD8DpHU99E="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 8cb9f8f9418d..b24204743678 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+ECYt4DRf8UO/MIpaOiGITTp3ep1+nhbtUEA3t9G3aU="; + sha256 = "sha256-Mjmj7B/f3MGAj6JXLeqFnMhhfmK4YyBPFfGdemm41J0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index e08ee40aa00d..71a7e80269fe 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -9,22 +9,24 @@ , google-cloud-core , google-cloud-testutils , mock +, pandas , proto-plus , pytestCheckHook , pytest-asyncio , pythonOlder +, rich }: buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.2.1"; + version = "3.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oREcVPdcbbBFMQz55xLm8Q0bemTrVwsj+4ew73A11Kw="; + hash = "sha256-cZEhSRzDSe4/hGAPPCkWtbuV1oYLlNkNNPj2PZedEiA="; }; propagatedBuildInputs = [ @@ -40,8 +42,10 @@ buildPythonPackage rec { flask google-cloud-testutils mock + pandas pytestCheckHook pytest-asyncio + rich ]; disabledTests = [ diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 67a3f66c91ad..31c0b127c111 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eLd8lHhyGjJBTaNzP8amzWa3LyaAixzj+6EpRU2J0bg="; + hash = "sha256-PXZGPMer/Y4zmx2Us8EfrLYLnF1tgF63ZDHmBmPPM0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 3c096baca1aa..8c3f2f683e70 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7mlufFubKLJ7vRqpL8I6nRsFXfxcqyg063OUtkGxydo="; + sha256 = "sha256-KYZvlpPqGy0zGDSZF3y6MsFZyb9M+88HGYp4NpPCiSY="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 80f33305ffcd..bc3737f5bfd1 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eINiPP8CACiYP2nSY1U60EoYFlXhvA/0ykw2CUWP1lQ="; + sha256 = "sha256-pr/JPao4GS5XrmeRLk3f1bCaDqlqXodWsn+cTEoR+NM="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index ae095ad5894d..62464c1bc09a 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.5"; + version = "2.13.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bpokSPdTEE2dVytUsxhyb46fn+0lRvCeS/+3Cefn2+I="; + hash = "sha256-1ksbqghjKwh0IvL3SsNcwVrQtJJ82ZHJDp/u35sorSg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 3e03a9307daf..94641ead4529 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ghVCb0kur3gABkcfkvGjBo2QKPxyQuoZPtEtKyXOT1o="; + hash = "sha256-tVBbsZod71v3hvkuWI4xIJYsx2xT7m7c4B9in/P2ww0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index d3be0ae5a1bb..db357ac43dd5 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-loyEh0R4jtOThDJXntnWi/q74WmXmC7E4f6h059UccU="; + hash = "sha256-Mrhy1jGMWdecNntt8eKdEEgq+Y/eNaO/bTwR2n9oxMQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index f52cd4572155..9246c8393ffe 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.12.2"; + version = "2.12.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FSJFryLFttU/HWIFl4buRYOQoSd5cGmUS+FlHO8YzNE="; + hash = "sha256-591Z/JIMwIwjhj4VKJKUztu2FMupdyUuKmxxUfK/TLE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index f141cc730ea8..67c60295c51f 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Tz8TFt1EwmEuQr2IPzTgz+PIkGJqJwXwfCndl/5DIbA="; + hash = "sha256-Jrd1ySx6n2ilUbObPrvsLOzUIUIGHeFQZTop8xbrAdY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 30e359f40bca..fb35e7688e68 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.17.0"; + version = "3.19.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OSMlbvkvSzp2xqwPVoe4dfpYn2leox1huqD/WXlXlZk="; + sha256 = "sha256-QGigxsIrIF/ey1hL5wTdo1Z6VqRQQX4vpgen1HgzaiQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 50340a8dfbfb..b45490087ebf 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/KQ8QM21L5aDy5NuNgrfTPTckU1d1AgdfzHY7/SPFdg="; + hash = "sha256-kTNDOgqSNdl2GytcrkZg8APCEFZ4ofUcEBIlvIXv/M8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 8746510b505b..84f489a220b6 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X+JvE4GzDjzDKPRuE1McqFJUWPhwweMDxha963t/XGY="; + hash = "sha256-OC80uR3iIS48LntA7AedJ+4uPbuumbdbG82MYwY84jU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 42b4ddf07605..1aa58d872842 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.10.1"; + version = "2.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Us6K8gf8zzdbek9CDgitkhb40IA9MkqFNblLw/KmfSc="; + hash = "sha256-9vAUmK1GG06fNK+d3WMRht2/7Ftaz56ec9xwP5eXxDU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index cc3d35c88599..7a3e2a85b1b5 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.12.0"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HcLY/dpWQzsfCmwtwePidqlDuLHmlEgLUEdGkHOgdsw="; + sha256 = "sha256-JWwYnz12E56GrUSDoatB8pbS+S9C3ZSPsxDW25GfDhA="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 9f5df9bd989e..b828ea516a46 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4EC6jLcFNF8G0dXvc+cZB6Ok3zeltc6Xon8EGRTkyCs="; + sha256 = "sha256-zd/N/eVhacopDiYiVbcVNaBOvpMfO426ktuQYhForkQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index f87d3e819e43..ce0184b8d719 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xdnMOy1JkmNnC+seLsxJp+Oq2G3oGXsKHS3//Bzfgq8="; + hash = "sha256-1g+bCXNeSMm166qlNU/ZwhC9IMdmPkGAtaxpYfmxOU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 449d0edfd6f6..0af930a08f2d 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d5sEMQxHUTrCmGJehsFHBPK79YhpnscTGk9ilKpwrUQ="; + sha256 = "sha256-I86T4Zw7y4pn5ixy+RM6LBMTEGuv7LR2uE2mwoEeCh0="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 52f3118063fb..0627c2b6277d 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-y1nqjaVX7Sm2PGjRxhxnqTiFJAudsgg3x2qsebyMW+8="; + hash = "sha256-X8YR2tTEgcYeN6j4VfXa4AaU+uRbxabWQydc0UYXFbI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index b162a6559b98..a5637da383e8 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sjw31xRPrLYF/kslmWn/UIYX95RZ+cSCz23AGToRbGc="; + hash = "sha256-PJ1qqLAAyTmOqfLDxV2IASX9nnHOQTfAwSAotC4qlLQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 5870f448db98..532481fbeeba 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper glibcLocales gobject-introspection gtk3 libsoup libsecret ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index c39fc338a176..14d11af62e3b 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hjDbo0lpsQXiZ8vhQjfi1W2ZacgBmArl5RkLwYsnktY="; + sha256 = "sha256-U93+BnQ8TVkk+x5ZdlW/oU6A/q9XpDi/0oRC02rHwrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index e6098208033a..aa8d2acf1c94 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -11,20 +11,28 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.0.4"; + version = "1.0.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; - # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "scrapy"; repo = pname; rev = "v${version}"; - sha256 = "0j68xgx2z63sc1nc9clw6744036vfbijdsghvjv6pk674d5lgyam"; + hash = "sha256-ueq1Rsuae+wz4eFc1O7luBVR4XWGbefpDr124H6j56g="; }; - propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; + propagatedBuildInputs = [ + w3lib + parsel + jmespath + itemadapter + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ # Test are failing (AssertionError: Lists differ: ...) @@ -32,12 +40,15 @@ buildPythonPackage rec { "test_nested_xpath" ]; - pythonImportsCheck = [ "itemloaders" ]; + pythonImportsCheck = [ + "itemloaders" + ]; meta = with lib; { description = "Base library for scrapy's ItemLoader"; homepage = "https://github.com/scrapy/itemloaders"; + changelog = "https://github.com/scrapy/itemloaders/raw/v${version}/docs/release-notes.rst"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 08eed6e941e7..be848b652827 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -1,36 +1,42 @@ { lib , buildPythonPackage -, pythonOlder -, fetchPypi , certifi +, fetchPypi +, pythonOlder , requests -, six +, urllib3 , websocket-client }: buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.8.1"; + version = "1.9.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "t2XmZ7rsrZq943lzRDrqzsY/djFNjFbkEYeHeA2AViI="; + hash = "sha256-fS+NQUTKNxHuE+qsV91mpTlYt7DfXQVsA9ybfLlHYtc="; }; propagatedBuildInputs = [ certifi requests - six + urllib3 websocket-client ]; - doCheck = false; # no tests - pythonImportsCheck = [ "jellyfin_apiclient_python" ]; + # Module has no test + doCheck = false; + + pythonImportsCheck = [ + "jellyfin_apiclient_python" + ]; meta = with lib; { - homepage = "https://github.com/jellyfin/jellyfin-apiclient-python"; description = "Python API client for Jellyfin"; + homepage = "https://github.com/jellyfin/jellyfin-apiclient-python"; license = licenses.gpl3Only; maintainers = with maintainers; [ jojosch ]; }; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 7f42902583d6..683811e0df5c 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.6"; + version = "0.9.9"; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; rev = "v${version}"; - sha256 = "sha256-RJj5KvLKq43tRuTwxq/mB+sU35xTQwZqg/jpdYcMP6A="; + hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; }; checkInputs = [ @@ -21,7 +21,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "json5" ]; + pythonImportsCheck = [ + "json5" + ]; meta = with lib; { homepage = "https://github.com/dpranke/pyjson5"; diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 069e7c16f0a5..9140e2290d24 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "3.10.1"; + version = "3.10.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mtbvIsSXK4VIB5cDT8eRRyjrePGFa02rM2Fobk8gyd0="; + sha256 = "sha256-VZrUaS+X9C3WufCzMKuScD8CuORbuvbpz1mJiolyIqA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 62730df149ea..38f146a71d13 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -7,7 +7,7 @@ , pythonOlder , requests , pytestCheckHook -, pyjson5 +, json5 , babel , jupyter_server , openapi-core @@ -40,7 +40,7 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = [ requests jsonschema pyjson5 babel jupyter_server ]; + propagatedBuildInputs = [ requests jsonschema json5 babel jupyter_server ]; checkInputs = [ openapi-core diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 1739881ea96d..7ad697d341b1 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -1,14 +1,14 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder -, requests }: buildPythonPackage rec { pname = "life360"; - version = "4.1.1"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,11 +17,11 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "v${version}"; - sha256 = "v+j0DBWQb1JdOu+uxJAdWhzef5zB62z+NSQ+WxpsinA="; + hash = "sha256-cIyN69rDuP83jjjqJ0Zc1XN8fVMbfhHKfKJNDqi6gdc="; }; propagatedBuildInputs = [ - requests + aiohttp ]; # Project has no tests diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 19b1a743ee49..921ba4d33604 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.15"; + version = "0.7.16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-Okkkc7cv4OROQ7tP1YMcdXbK6o6wvuzYFLTCqVu/4ck="; + sha256 = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 6cb19f037098..494386212d7b 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.5"; + version = "1.4.0"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gZko9eR1yM4NWX5wUlj7GQ+A/KflYYVojR595VhmMzc="; + sha256 = "sha256-QJq2BMnr4bt9wY7GsO2YqK1RJ7CCc/WASyL00bUeUiI="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 74ccf0b1868e..83b55ad55841 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "monai"; - version = "0.9.0"; + version = "0.9.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = version; - sha256 = "sha256-HxW9WYxt2a7fS9/1E9DtiH+SCTTJoxYBfgZqskYdcvI="; + hash = "sha256-GU439svMHY1qIUZ0gM5c5tt6G1hh9eAHYV+38Munw9I="; }; # Ninja is not detected by setuptools for some reason even though it's present: diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index edd5b0ec0ddd..e0db9f0099d2 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.100.0"; + version = "0.101.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AT9WDdoxtW5sGiL0h9n4y/3xvClcDoh1N3TFVHjPB0c="; + hash = "sha256-YIAMenWg0WXFnwa7yLPnUxVHG4hrmf3EGy76qVpLd5o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 7a379d3a019e..9a2d6e37ab56 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -35,31 +35,31 @@ buildPythonPackage rec { testscenarios ]; - checkPhase = - let aarch64TestsExcluded = lib.optionalString stdenv.hostPlatform.isAarch64 '' - openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries - openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists - openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force - openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second - openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found - ''; in - '' - stestr run -e <(echo "${aarch64TestsExcluded} - openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked - openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed - openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait - openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait - openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task - openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 - openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none - openstack.tests.unit.test_stats.TestStats.test_list_projects - openstack.tests.unit.test_stats.TestStats.test_projects - openstack.tests.unit.test_stats.TestStats.test_servers - openstack.tests.unit.test_stats.TestStats.test_servers_no_detail - ") - ''; + checkPhase = '' + stestr run -e <(echo " + '' + lib.optionalString stdenv.isAarch64 '' + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries + openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists + openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force + openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second + openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found + '' + '' + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait + openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none + openstack.tests.unit.test_stats.TestStats.test_list_projects + openstack.tests.unit.test_stats.TestStats.test_projects + openstack.tests.unit.test_stats.TestStats.test_servers + openstack.tests.unit.test_stats.TestStats.test_servers_no_detail + openstack.tests.unit.test_stats.TestStats.test_timeout + ") + ''; } diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 3db023447f61..266294325c17 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.20.6"; + version = "1.22.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-RJtFN+g/R3a9aQUcTXdtuP/j+dBkHx6HsGwRbrlMkOk="; + sha256 = "sha256-wuZpP99oxAWmQoImkVqGJdIdBRN5NZiuMoehIQR42Ow="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 626de02595e3..ac1bbde83c26 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.45"; + version = "3.46"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ksZM2PaeYhluq4nyw6MTFjSb/fQNJha7BRc8/U/7zwg="; + sha256 = "sha256-T7zaNepat9RQReCeww+kJOBK0vjfdahkjRgx27AWpcE="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index c02400fd1970..3b22c119ba20 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pygeos"; - version = "0.12.0"; + version = "0.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PEFULvZ8ZgFfRDrj5uaDUDqKIh+cJPsjgPauQq7RYAo="; + sha256 = "sha256-HDcweKrVou/tHDnNcceXqiAzvzCH8191FrrIm+ULmGE="; }; patches = [ diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index c8356f0e12f7..70366adaa406 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "pyhumps"; - version = "3.7.2"; + version = "3.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "nficano"; repo = "humps"; rev = "v${version}"; - hash = "sha256-nxiNYBpbX2GfzYj+DdU89bsyEHDnrKZIAGZY7ut/P6I="; + hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc="; }; nativeBuildInputs = [ @@ -29,15 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix naming, https://github.com/nficano/humps/pull/246 - (fetchpatch { - name = "fix-naming.patch"; - url = "https://github.com/nficano/humps/commit/8c7de2040e3610760c4df604cdbe849a9b7f0074.patch"; - sha256 = "sha256-dNgPAOxPdCwDteobP4G2/GiVj/Xg+m7u/Or92vo8ilk="; - }) - ]; - pythonImportsCheck = [ "humps" ]; diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix deleted file mode 100644 index 232bafd3ba7e..000000000000 --- a/pkgs/development/python-modules/pyjson5/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, lib, nose, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "pyjson5"; - version = "0.8.5"; - - src = fetchFromGitHub { - owner = "dpranke"; - repo = pname; - rev = "v${version}"; - sha256 = "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn"; - }; - - doCheck = true; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; - - meta = with lib; { - description = "Python implementation of the JSON5 data format"; - license = licenses.asl20; - homepage = "https://github.com/dpranke/pyjson5"; - maintainers = with maintainers; [ isgy ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 9652e0289464..a17c4dee7340 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -1,32 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , coverage +, fetchPypi , pytest +, pythonOlder }: buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.4"; - disabled = pythonOlder "3.6"; + version = "1.3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jr+uKjtm5nFYHrZpG63VNK/wO93TQJh1x4SoTxJtlw0="; + hash = "sha256-ncgNO76j2Z3766ojYydUoYZzRoTb2XxhR6FkKFzjyhI="; }; - propagatedBuildInputs = [ pytest coverage ]; + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + coverage + ]; # The project does not include tests since version 1.3.0 doCheck = false; - pythonImportsCheck = [ "testmon" ]; + + pythonImportsCheck = [ + "testmon" + ]; meta = with lib; { + description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; - description = "This is a py.test plug-in which automatically selects and re-executes only tests affected by recent changes"; license = licenses.mit; - maintainers = [ maintainers.dmvianna ]; + maintainers = with maintainers; [ dmvianna ]; }; } - diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 3ece771e7b5f..e5728dabeffc 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.9"; + version = "0.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qqdIeVVyWRqvEntKyJhWhPNnP/grOfNwyDawBuaPxTc="; + sha256 = "sha256-cHWOOH/A4MS628s5T2GsvmizSXCo/tfg98iUaf4XkSo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 8c76861bcb86..3500e88e57ad 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "5.8.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-M0hS34iXuV8FgewS7ih96MepKJogihjwqLOHdwGf2YY="; + sha256 = "sha256-kcOsEtpLQjwWs5F2FvhKI+KWHnUPzlkNQJ7MUO4EMc4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index d08086ab4595..a7ba5252b4b0 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -22,11 +22,12 @@ , pytz , termcolor , typer +, ffmpeg }: buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.1.7"; + version = "4.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,9 +36,16 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FaH1fNNWQAe9hLrbLf0TCfcjY6MDmHrsmo3LaEsN3W4="; + hash = "sha256-q6fzP1wauwnRUByGc+EQ/vNJgoCWx22Qh2uZeUF4Abk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=pyunifiprotect --cov-append" "" + substituteInPlace setup.cfg \ + --replace "pydantic!=1.9.1" "pydantic" + ''; + propagatedBuildInputs = [ aiofiles aiohttp @@ -60,6 +68,7 @@ buildPythonPackage rec { }; checkInputs = [ + ffmpeg # Required for command ffprobe pytest-aiohttp pytest-asyncio pytest-benchmark @@ -68,13 +77,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=pyunifiprotect --cov-append" "" - substituteInPlace setup.cfg \ - --replace "pydantic!=1.9.1" "pydantic" - ''; - pythonImportsCheck = [ "pyunifiprotect" ]; @@ -83,11 +85,6 @@ buildPythonPackage rec { "--benchmark-disable" ]; - disabledTests = [ - # Tests require ffprobe - "test_get_camera_video" - ]; - meta = with lib; { description = "Library for interacting with the Unifi Protect API"; homepage = "https://github.com/briis/pyunifiprotect"; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 7a8d9f2b40ee..704d4440ff78 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.14"; + version = "9.2.15"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xKy/+MbJJEYWXalvYhVi/J7IAn1CSrvkeg18vM0fy4k="; + hash = "sha256-Yik1RTz4SQBFJxgPzp7LnPHV4EMbxGEhD2fBVcKJC7c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 569a29d9b5cb..45b03feb461d 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -26,37 +26,22 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.5"; + version = "0.9.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "reclosedev"; + owner = "requests-cache"; repo = "requests-cache"; rev = "v${version}"; - hash = "sha256-oVEai7SceZUdsGYlOOMxO6DxMZMVsvqXvEu0cHzq7lY="; + hash = "sha256-oFI5Rv/MAiPHiZts0PrNS+YMDFD/RxnMJ6deTxZNkSM="; }; nativeBuildInputs = [ poetry-core ]; - postPatch = '' - # - # There is no functional reason why attrs (and cattrs) need to be - # restricted, but the versions are in flux right now. Please read - # and follow the following issue for the latest: - # - # https://github.com/requests-cache/requests-cache/issues/675 - # - # This can be removed once that issue is resolved, or if the new - # major version is released. - # - substituteInPlace pyproject.toml \ - --replace 'attrs = "^21.2"' 'attrs = ">=21.2"' - ''; - propagatedBuildInputs = [ appdirs attrs diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 5b1e863c7785..87e34b376375 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -2,31 +2,29 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "svgwrite"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "mozman"; repo = "svgwrite"; rev = "v${version}"; - sha256 = "sha256-d//ZUFb5yj51uD1fb6yJJROaQ2MLyfA3Pa84TblqLNk="; + sha256 = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I="; }; # svgwrite requires Python 3.6 or newer disabled = pythonOlder "3.6"; - checkInputs = [ - pytest - ]; + checkInputs = [ pytestCheckHook ]; - # embed_google_web_font test tried to pull font from internet - checkPhase = '' - pytest -k "not test_embed_google_web_font" - ''; + disabledTests = [ + # embed_google_web_font test tried to pull font from internet + "test_embed_google_web_font" + ]; meta = with lib; { description = "A Python library to create SVG drawings"; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 6457a4521a40..c56b8abd0978 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.29.1"; + version = "2.30.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PoTob/Qz/XxEv/A271RQWT11rIIJBejVGjpAT14iKUg="; + sha256 = "sha256-Ytxs7hWQa7iaBinO2nhiXhNvo7lsuhmDPnqE1K62C5k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index 67a384f4b22b..e3210b443252 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; + sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index f43397fb4b7b..c205d548f5e5 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.4.2"; + version = "2.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-WVyMYmuezTS3GNcIY9Uh+/0+lcgdmoLL6o5d1SFMfvE="; + sha256 = "sha256-S2myMuQq1a3IFGwRi2KqHDhyPyJNGNUH9Xp0mBZMNh8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index f8a5124f2df4..e9676c0fa707 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -2,24 +2,35 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "twitter"; - version = "1.19.3"; + version = "1.19.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "a56ff9575fbd50a51ce91107dcb5a4c3fd00c2ba1bcb172ce538b0948d3626e6"; + hash = "sha256-g7jSSEpsdEihGuHG9MJTNVFe6NyB272vEsvAocRo72U="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; + doCheck = false; + pythonImportsCheck = [ + "twitter" + ]; + meta = with lib; { description = "Twitter API library"; - license = licenses.mit; + homepage = "https://mike.verdone.ca/twitter/"; + license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; }; - } diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 08f8aad90cdf..e4f71c91f505 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.15"; + version = "4.3.18"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vPLIUsLQ9vmZ8QGAvfytC7+pchdYJs7XCl71i3EAS2w="; + sha256 = "sha256-ImBTLBV9T2T24mbeZ7CqoZec+5aeQJoWRF7Gl2xKHeY="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 6fefdd792a3e..16a0906a3b1d 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.1.0"; + version = "65.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V/fYnqpSpAzLl/LL5heMatkPhDr7Z2gJM/jvFHLaU/g="; + sha256 = "sha256-wmd5y7o5R4I8JgNUraq06RyowYiIqit0D1A4RLiPGBM="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index d31fd1569f28..8d3e0769786b 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -10,6 +10,8 @@ , pytest-xprocess , pytestCheckHook , markupsafe +# for passthru.tests +, moto, sentry-sdk }: buildPythonPackage rec { @@ -56,6 +58,10 @@ buildPythonPackage rec { "-m 'not filterwarnings'" ]; + passthru.tests = { + inherit moto sentry-sdk; + }; + meta = with lib; { homepage = "https://palletsprojects.com/p/werkzeug/"; description = "The comprehensive WSGI web application library"; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 9d01e4531159..4672bad4ca4d 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -20,6 +20,7 @@ , meta ? {} , groups ? null , ignoreCollisions ? false +, nativeBuildInputs ? [] , buildInputs ? [] , extraConfigPaths ? [] , ... @@ -102,7 +103,7 @@ let basicEnvArgs = { - inherit buildInputs ignoreCollisions; + inherit nativeBuildInputs buildInputs ignoreCollisions; name = name'; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 96fbdaa5d6a0..3b4103626b8b 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-+hZpCIDASPerI7Wetpx+ah2H5ODjoeyoqUi+uFwR/9A="; + ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; + subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index c4ead0405937..c9e362ecfefc 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "4.1.0"; + version = "4.6.2"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-YuG7H+7FXYGbNNhM5vxps72dqltcj3bA325e7ZbW8aI="; + sha256 = "sha256-D2Ivem7xg4KrAHYxs4Cx7Ekgyc5u2KrjX4miYz11wuI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 9dc5a063634f..5254e6de4dc0 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.185.1"; + version = "0.185.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-GZ1DzMlhwIyQtkNYXU6sLoqRNinOXN+A7ImkaNSGuJY="; + sha256 = "sha256-7TpYM0kHWlWSX7+NYevskNUlvdEsfjffSnKpx0sb/2w="; }; makeFlags = [ "FLOW_RELEASE=1" ]; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 31c1b5dc521b..f5b75f8e6696 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { dotnet-sdk mono unzip + makeWrapper ]; buildInputs = [ dotnetPackages.Nuget glibcLocales - makeWrapper ]; # https://github.com/NixOS/nixpkgs/issues/38991 diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix index 2a11ab5ca41b..b171152a36ed 100644 --- a/pkgs/development/tools/cbfmt/default.nix +++ b/pkgs/development/tools/cbfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cbfmt"; - version = "0.1.1"; + version = "0.1.4"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cTX7eBcEZiTJm3b1d2Mwu7NdbtHjeF+dkc3YMede0cQ="; + sha256 = "sha256-MOvTsyfKsBSog/0SpHJO9xiIc6/hmQVN4dqqytiiCgs="; }; - cargoSha256 = "sha256-vEInZplfgrM4gD5wPATl7j5iTo9pSstElfd0Lq9giJw="; + cargoSha256 = "sha256-Vu4bcw5WSwS2MB0sPumoQDhSdjnZyzrYF8eMPeVallA="; passthru.tests.version = testers.testVersion { package = cbfmt; diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix new file mode 100644 index 000000000000..de0fd5c16fbd --- /dev/null +++ b/pkgs/development/tools/changie/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "changie"; + version = "1.8.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "miniscruff"; + repo = pname; + sha256 = "sha256-VzrSfigpkOvgywq0dHIXZS2If8qc8HCo51FzopKORwM="; + }; + + vendorSha256 = "sha256-+Q0vNMd8wFz+9bOPfqdPpN2brnUmIf46/9rUYsCTUrQ="; + + meta = with lib; { + homepage = "https://changie.dev"; + description = "Automated changelog tool for preparing releases with lots of customization options"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index ff47eeb72b2c..9b7b7f3cf390 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.295.0"; + version = "2.296.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-C5tINoFkd2PRbpnlSkPL/o59B7+J+so07oVvJu1m3dk="; + hash = "sha256-TLBd+L4k/qtY9q0j+soxaLCfER/USZyYCqk0r8A6sSo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 74452889daf4..a9ced9472ded 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N/uYVp89zL+dq8GcZBIrKimR/K1FFa+lDVtb7K28n+Y="; + sha256 = "sha256-wvF81bzNW1ps+iZ9HDmE91vciD8l8dO0HS5XGUDa+AA="; }; - vendorSha256 = "sha256-d8YwdtSkcmh+Kromi8GsD2M8k2x8Ibrymsa+rG5GEoU="; + vendorSha256 = "sha256-7pKaIhIqINy7A/QE9teVT/S2ho9atnKcixk8y5DEuVk="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 84b53a08c67d..921872e41288 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "1.5.25"; + version = "1.6.13"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-OB5o/ouA6a2/OUnhibTKYCskCFmJIuDcXLrNTNWtNEQ="; + hash = "sha256-8Qv/b/UrNqVI+DZc9H2rjx4JmW66BqAhgxyqCZXMnsI="; }; - vendorSha256 = "sha256-6Ve7Ui90KHsFwRs6/uyjqHgRY6U7zFWijSFcVuOXdEM="; + vendorSha256 = "sha256-FvLNG7zz/tPW8SdUvfD1e4/a7nBHFOvhpyn2cXZE9AA="; ldflags = [ "-extldflags '-static'" diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index dced6c6cde2d..f433c54ad524 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -20,7 +20,7 @@ with lib; let - pVersion = "1.12.0.20210602"; + pVersion = "1.13.0.20220615"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-qX4RPuZdeiEduJAEpzOi/QnbJ+kaD0PZ3WHrmGsvqHc="; + sha256 = "sha256-LwtP76kb9xgdcsWCSCXeRbhFVyFS3xkl15F075Cq4Os="; }; desktopItem = makeDesktopItem { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png ''; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip makeWrapper ]; buildInputs = [ fontconfig freetype @@ -90,7 +90,6 @@ stdenv.mkDerivation rec { libX11 libXrender libXtst - makeWrapper zlib shared-mime-info webkitgtk diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index 1d012c691018..9c1cf9286844 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Fn+pPYknuQCofTNrgDbZ4A6C5hazSqKqlUOUG10ekU="; + sha256 = "sha256-Dim/8RXBMZTITGlT7F7TdAK9S2ct7w01861QqeT2FZk="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-IxlzSzFEIIBC32S7u1Lkbi/fOxFYlbockNAfl/tnJpA="; + vendorSha256 = "sha256-HcD7MnUBPevGDckiWitIcp0z97FJmW3D0f9SySdouq8="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index b69aa66948d8..f3e5bd0337ed 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.1.6"; + version = "9.2.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-ZqvphqQsuLbc23TaMEIZvoghdZ2hA3GkJu40G6ykJXQ="; + sha256 = "sha256-vNTL1yIGYgldjC69Yhj8fGShvfaDv5zM82cxwZMpzQw="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec{ This package is only the Community Edition of the Flyway command-line tool. ''; + downloadPage = "https://github.com/flyway/flyway"; homepage = "https://flywaydb.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 697899ad8672..befae0e211d0 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-9ABlfA7osM1bYMwNy/pQyb32uJbwZry3s3iGHBXiQHQ="; + sha256 = "sha256-tKJ07CNyiL2z/FYd8K3Iurif2hmdHKcNClV3odR2c64="; }; - vendorSha256 = "sha256-GDhaeR26MXWR23yVy4kjo/mIUR3vezEs8twjoRgzbwU="; + vendorSha256 = "sha256-v4bpShw78hJE4KupE1VhbbUYmQftwpRmQ67Nuw+HAZU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 68341e7e4006..10d80b4eae95 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-+e/wUHoeJ00MbGfkDpGwRvJH+fboMfyGY+SXbqBqP1c="; + sha256 = "sha256-S+WhBenTMyN7nM/UQIuMH1t9I/DRzQWN6g6tOWT71uo="; }; vendorSha256 = "sha256-RqhGGIwruAlrif2FZ+tvsicns56Ifjpy2ZHovDyjdB4="; diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 26bf59ecff41..8cfa4c802992 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-roEJMaRalvk/XT1f15R4DPnlkxo3hPDHdzOfDtZAa8Y="; + sha256 = "sha256-9m0g8hfJ+gazYHq2TzSN/0d2o789QBhbIpGxdXhNBGk="; }; vendorSha256 = "sha256-yDPCfJtYty4aaoDrn3UWFcs1jHJHMJqzc5f06AWQmRc="; diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/development/tools/golangci-lint-langserver/default.nix index 0da4498bd9b0..d2c3202f2146 100644 --- a/pkgs/development/tools/golangci-lint-langserver/default.nix +++ b/pkgs/development/tools/golangci-lint-langserver/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "golangci-lint-langserver"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "nametake"; repo = "golangci-lint-langserver"; rev = "v${version}"; - sha256 = "0x3qr2ckyk6rcn2rfm2sallzdprzxjh590gh3bfvqn7nb1mfw367"; + sha256 = "sha256-VsS0IV8G9ctJVDHpU9WN58PGIAwDkH0UH5v/ZEtbXDE="; }; vendorSha256 = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index d37147253180..3a3b153cfbf2 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -14,7 +14,7 @@ let in buildEnv { name = "ihaskell-with-packages"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ ihaskellEnv jupyter ]; postBuild = '' ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/ diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 095bfefd0a6a..fe5d8cf9ea11 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -33,12 +33,15 @@ buildGoModule rec { installShellCompletion --cmd jira \ --bash <($out/bin/jira completion bash) \ --zsh <($out/bin/jira completion zsh) + + $out/bin/jira man --generate --output man + installManPage man/* ''; meta = with lib; { description = "Feature-rich interactive Jira command line"; homepage = "https://github.com/ankitpokhrel/jira-cli"; license = licenses.mit; - maintainers = with maintainers; [ bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 anthonyroussel ]; }; } diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 805726a28ad2..75971e7ad342 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iwg4mo8E3RV1NRX/95FXKmDJxcUJDk+sV14ehdI8d68="; + sha256 = "sha256-6laSFo8aBmZpeN5V3utZQHIWuoQcdy1hd1yU8LxpEJQ="; }; - cargoSha256 = "sha256-/3XqnH6x7b319Y3Q5RDCH4FHF2GAaP2kMLSEPeJyNqI="; + cargoSha256 = "sha256-bbyeI/cr5aBejiEcYyyyJO8UX5QoIlT9MFgnpDr/z1M="; cargoBuildFlags = [ "--package" "lang-srv" ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 8f784b919bfd..6e98883bf534 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.20688"; + version = "0.1.20788"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LamLFMlmXCQa/Ob+VnHrAZjVtVTBjbpEaqA3EjRSnCU="; + sha256 = "sha256-noREDDxy4p7LVvTehzbPPKY5Bt9r/kJii6Q//JiCD0A="; }; vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE="; diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 9182c7014130..c0489cdab04b 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-rYydkAX5nA5IH8FGgLomjgRJkr0Vhk5trbxGHg0FVOI="; + sha256 = "sha256-YT/DGxdsMXjCp908U2jfkQpDBPCTNjObdeIj06Bum/U="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/dura/Cargo.lock.patch b/pkgs/development/tools/misc/dura/Cargo.lock.patch new file mode 100644 index 000000000000..48db9caaa291 --- /dev/null +++ b/pkgs/development/tools/misc/dura/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git i/Cargo.lock w/Cargo.lock +index e037758..e039531 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -106,7 +106,7 @@ dependencies = [ + + [[package]] + name = "dura" +-version = "0.2.0-snapshot" ++version = "0.2.0" + dependencies = [ + "chrono", + "clap", diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 621058be664c..ab88298f45a3 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -1,22 +1,28 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, Security }: rustPlatform.buildRustPackage rec { pname = "dura"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tkellogg"; repo = "dura"; - rev = "v0.1.0"; - sha256 = "sha256-XnsR1oL9iImtj0X7wJ8Pp/An0/AVF5y+sD551yX4IGo="; + rev = "v${version}"; + sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM="; }; - cargoSha256 = "sha256-+Tq0a5cs2XZoT7yzTf1oIPd3kgD6SyrQqxQ1neTcMwk="; + cargoSha256 = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48="; + + cargoPatches = [ + ./Cargo.lock.patch + ]; doCheck = false; buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; nativeBuildInputs = [ @@ -34,7 +40,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/tkellogg/dura"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ drupol ]; }; } diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 4371efca4f0a..8d41b7488e4d 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -14,16 +14,16 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-za3TauhNoxGDphpY615EnTt46HpMgS+sYpBln/twefw="; + sha256 = "sha256-vGKDngFYh24wwR5nAYEz1GXm+K4sqEBvOp9jsioE0wU="; }; - cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; + cargoSha256 = "sha256-s2gQuLkPxKQceGl3II9D6vWisYgL+YCI/YhX+mSyPoo="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -48,7 +48,7 @@ in rustPlatform.buildRustPackage rec { # generate the man page + lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 + # https://github.com/latex-lsp/texlab/blob/v4.2.2/.github/workflows/publish.yml#L131-L135 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index b5100afee984..e917a5a76da6 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -6,7 +6,7 @@ , buildDunePackage , yojson , csexp -, result +, merlin-lib , dot-merlin-reader , jq , menhir @@ -15,13 +15,12 @@ }: let - merlinVersion = "4.5"; + merlinVersion = "4.6"; hashes = { - "4.5-411" = "sha256:05nz6y7r91rh0lj8b6xdv3s3yknmvjc7y60v17kszgqnr887bvpn"; - "4.5-412" = "sha256:0i5c3rfzinmwdjya7gv94zyknsm32qx9dlg472xpfqivwvnnhf1z"; - "4.5-413" = "sha256:1sphq9anfg1qzrvj7hdcqflj6cmc1qiyfkljhng9fxnnr0i7550s"; - "4.5-414" = "sha256:13h588kwih05zd9p3p7q528q4zc0d1l983kkvbmkxgay5d17nn1i"; + "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; + "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; + "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; }; ocamlVersionShorthand = lib.concatStrings @@ -49,12 +48,7 @@ buildDunePackage { dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) - ] ++ lib.optional (lib.versionOlder ocaml.version "4.12") - # This fixes the test-suite on macOS - # See https://github.com/ocaml/merlin/pull/1399 - # Fixed in 4.4 for OCaml ≥ 4.12 - ./test.patch - ; + ]; strictDeps = true; @@ -65,8 +59,9 @@ buildDunePackage { buildInputs = [ dot-merlin-reader yojson - csexp - result + (if lib.versionAtLeast version "4.6-414" + then merlin-lib + else csexp) menhirSdk menhirLib ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3db5d1377831..cff881d1c97e 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,16 +3,14 @@ buildDunePackage rec { pname = "merlin"; - version = "3.4.2"; + version = "3.8.0"; src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81"; + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; + sha256 = "sha256-wmBGNwXL3BduF4o1sUXtAOUHJ4xmMvsWAxl/QdNj/28="; }; - useDune2 = true; - - minimumOCamlVersion = "4.02.3"; + minimalOCamlVersion = "4.02.3"; patches = [ (substituteAll { diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 894fe6f75ae9..e3fef3f4cc40 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,19 +1,15 @@ -{ lib, fetchurl, yojson, csexp, result, buildDunePackage }: +{ lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }: buildDunePackage rec { pname = "dot-merlin-reader"; - version = "4.1"; - useDune2 = true; + inherit (merlin) version src; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; - src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz"; - sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd"; - }; - - buildInputs = [ yojson csexp result ]; + buildInputs = if lib.versionAtLeast version "4.6-414" + then [ merlin-lib ] + else [ yojson csexp ]; meta = with lib; { description = "Reads config files for merlin"; diff --git a/pkgs/development/tools/ocaml/merlin/lib.nix b/pkgs/development/tools/ocaml/merlin/lib.nix new file mode 100644 index 000000000000..27c8035a5e3b --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/lib.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, merlin, csexp }: + +buildDunePackage { + pname = "merlin-lib"; + inherit (merlin) version src; + + minimalOCamlVersion = "4.14"; + + propagatedBuildInputs = [ csexp ]; + + meta = merlin.meta // { + description = "Merlin’s libraries"; + }; +} diff --git a/pkgs/development/tools/ocaml/merlin/test.patch b/pkgs/development/tools/ocaml/merlin/test.patch deleted file mode 100644 index 0101e825b967..000000000000 --- a/pkgs/development/tools/ocaml/merlin/test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 282eed37f39ff216add8d53766fd59f3737eb87f -Author: Vincent Laporte -Date: Thu Nov 4 06:24:07 2021 +0100 - - Ignore dune stderr in tests - -diff --git a/tests/test-dirs/document/src-documentation.t/run.t b/tests/test-dirs/document/src-documentation.t/run.t -index 2c9e1419..4f4c4327 100644 ---- a/tests/test-dirs/document/src-documentation.t/run.t -+++ b/tests/test-dirs/document/src-documentation.t/run.t -@@ -42,7 +42,7 @@ documentation for the non-last defined value (in the same file) is show - > jq '.value' - " List reversal. " - -- $ dune build --root=. ./doc.exe -+ $ dune build --root=. ./doc.exe 2> /dev/null - $ cat >.merlin < B _build/default/.doc.eobjs/byte - > S . diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix index 5d82e5c3a19c..61ed539c46da 100644 --- a/pkgs/development/tools/oras/default.nix +++ b/pkgs/development/tools/oras/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "oras"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-QmyMDmZXOXD+6T+7Xl9kPFeOrkP1styzwwWi5tH9aO0="; + sha256 = "sha256-mngFLFZG3JPd+GiiMjmU6OhqC3P7Y+Weaw+UgIVO0KQ="; }; - vendorSha256 = "sha256-JoSo716o1RmMlAFSauzgzH6ypE/Kxo/PniJ2PGdfKZ8="; + vendorSha256 = "sha256-tJSxickFtPx5T5408wbijpYBRXgR5nHL8hZ/yWV83lc="; ldflags = [ "-s" diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 2f82e53ab6d0..28330e19c580 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -66,6 +66,7 @@ tree-sitter-pug = lib.importJSON ./tree-sitter-pug.json; tree-sitter-python = lib.importJSON ./tree-sitter-python.json; tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json; + tree-sitter-ql-dbscheme = lib.importJSON ./tree-sitter-ql-dbscheme.json; tree-sitter-query = lib.importJSON ./tree-sitter-query.json; tree-sitter-r = lib.importJSON ./tree-sitter-r.json; tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 44069cb78ec5..6bbdd2914933 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "9c494a503c8e2044bfffce57f70b480c01a82f03", - "date": "2022-05-30T17:23:01+01:00", - "path": "/nix/store/h7jans0061yvwj7sph9bzp9ygx7nnqfa-tree-sitter-c-sharp", - "sha256": "1pjapli5a70a9308zlb3vfqamh7xybb06vqhljz4xkaagijs91yv", + "rev": "ad8e6980e9bf1882a324196229692febf332c4dd", + "date": "2022-08-22T14:15:43+01:00", + "path": "/nix/store/wl7r0cp4s43ivzxkd9vpvwp08xsl1cb2-tree-sitter-c-sharp", + "sha256": "17vn2cy23k1ms8dizyw2gz8gwfghhgd92xfvp9n4vnav9qzah09w", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 9fb8a320e0b6..828769cc0a15 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "517bf92b2c5e8baa4241cbb8a49085ed7c3c48d4", - "date": "2022-07-08T09:44:02-07:00", - "path": "/nix/store/0nz381ay9ybngxvialwxisji9j4gwadb-tree-sitter-c", - "sha256": "03klq9mb9jnhjxf8lv0mk02gdp83zcyrvx1bzrqbd9jdza3ji1xl", + "rev": "7175a6dd5fc1cee660dce6fe23f6043d75af424a", + "date": "2022-08-01T15:02:51-07:00", + "path": "/nix/store/qhd6cw55bgmgjmi0fwd16q00yhfq612w-tree-sitter-c", + "sha256": "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index abc1625810a5..c9484382e624 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,9 +1,9 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "e57c569ae332ca365da623712ae1f50f84daeae2", - "date": "2022-06-03T17:55:54+09:00", - "path": "/nix/store/fx58zcfxr983yczijs6cgdfa3158bl0s-tree-sitter-clojure", - "sha256": "0hq8rv4s0gzbfv3qj4gsrm87baiy6k1hyfbhbbpwbrcpd8jl7gdn", + "rev": "087bac78c53fe1387756cd5b8e68a69b3f6d7244", + "date": "2022-07-19T19:21:35+09:00", + "path": "/nix/store/n0kwbvimmzp36y789sb5jrbarjzlwmyf-tree-sitter-clojure", + "sha256": "018xrralv15d7r1v63knds7cyix77ssy4jr0qdjmbakdr00r4ara", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 5a90c5dcce77..2b39cdac7813 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "599836393074e4744d78dad76b8b8eb8e1f690ff", - "date": "2022-07-08T12:16:35+07:00", - "path": "/nix/store/w6nxam1m3kq35faqcx17qmgn250fv461-tree-sitter-cmake", - "sha256": "02gbi24rxq4qqlxzl17vi81xjk3d3y41ig6g8w2yc6f2ihiw85na", + "rev": "6e51463ef3052dd3b328322c22172eda093727ad", + "date": "2022-08-26T09:50:26+02:00", + "path": "/nix/store/h7v6r9x9d552gfl8s8dwf26azvdrmsc1-tree-sitter-cmake", + "sha256": "14l7l6cc9pdqinff9hjda7rakzfvwk0qcbv6djl0s9f21875l4nv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index a49aeb97de06..b98279ffcd4d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "38d8b495bd43977498f0eb122e0f9cfef8526d18", - "date": "2022-05-30T11:35:53-07:00", - "path": "/nix/store/4ndwshhwzcj9xrj8g0qnvqz7gwpd64z2-tree-sitter-cpp", - "sha256": "0lck8s0z0ay9aw6zljaq892xxmgx8wn3kgsin3sjf5ysyjdva3qn", + "rev": "f40125503642845492d87fa56ece3ed26a4ef4db", + "date": "2022-08-01T17:34:55-05:00", + "path": "/nix/store/cs7pplbqvrv3j30hl510c8qjgjx592pp-tree-sitter-cpp", + "sha256": "17kxbs87fqf87dh7rf56yqg1njhhmh2xw6f43bpkj7z1k2ryf5zk", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index a69e80fde082..d3b363be3cbb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "791d9f9e30958a5f951875342ec8b6f737b39533", - "date": "2022-05-14T13:37:18+02:00", - "path": "/nix/store/mwrqmqrvysf0dpb2lq6gv7d6798s90gi-tree-sitter-cuda", - "sha256": "0zixq97pm4rzhl14m2nb9ynndl2bf1jvkzjs25bh99qcikmdvw0i", + "rev": "bc48d8eaf5a145922a1bed0a69dca1342a83c12c", + "date": "2022-07-24T11:22:15+02:00", + "path": "/nix/store/xjgyflwrn6k3slzjvpy0mi1769z657li-tree-sitter-cuda", + "sha256": "0nd1xi5w9wjj4jbwlvwacs6b4q0syb91q06p27nc2ygs3v9wx3l7", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index f170476d1373..61a2f676e1c3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,9 +1,9 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "6fc75e0478e89a6adef4903069b0035247378665", - "date": "2022-05-21T14:45:10-07:00", - "path": "/nix/store/jma7070d07rgksa29ziavrj4ian9p2h3-tree-sitter-dart", - "sha256": "1k2877kia3i8df368z6ynig476yr051k60zijahmd7drm740aavb", + "rev": "53485a8f301254e19c518aa20c80f1bcf7cf5c62", + "date": "2022-08-11T13:38:34-07:00", + "path": "/nix/store/frp77jynv64s1x0l6hix5dk12zlsf5wq-tree-sitter-dart", + "sha256": "1ds1hz9gkvc3dp6bz93zlb1rixzhyj8cm6xfpb7cm4a8rhajz1yl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index bc84c3b1f37c..4bb30edf84f0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rydesun/tree-sitter-dot", - "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", - "date": "2022-03-11T21:17:49+08:00", - "path": "/nix/store/3xvainpyzwpbhbm30mmvvgxpgh4agljh-tree-sitter-dot", - "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2", + "rev": "9ab85550c896d8b294d9b9ca1e30698736f08cea", + "date": "2022-08-25T12:15:36+08:00", + "path": "/nix/store/p0lcm171skxdr4qbhqwl5slx76k9hap6-tree-sitter-dot", + "sha256": "013brrljrhgpnks1r0cdvj93l303kb68prm18gpl96pvhjfci063", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index abf03571fdbd..4eda4e35c8ef 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "5d0c1bfcdf8aaad225525acad930a972b319a675", - "date": "2022-04-28T11:17:48-05:00", - "path": "/nix/store/a3vks004yjn7pb80nppdyq0k18wm3myc-tree-sitter-elixir", - "sha256": "1iff2gk6r6qa13imizxawc4hjwwwsnvhvhafcwab2q2476gk82mz", + "rev": "05e3631c6a0701c1fa518b0fee7be95a2ceef5e2", + "date": "2022-08-04T13:28:43-05:00", + "path": "/nix/store/ixqcx5344qr5bzjgyl05zcp2f0gnkbz8-tree-sitter-elixir", + "sha256": "0qy4dgs72dyr9cv16q8na7xxkhsqjyk99xnwpgqm1sa8m0yjjyp6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index bdb451c69ec9..32c0efb2ce69 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "a9a8efad446f78db3989d7ed8517987daf510c83", - "date": "2022-06-07T23:23:33+02:00", - "path": "/nix/store/rqmldb72cml0qm7p8kpjlj064f5miprc-tree-sitter-elm", - "sha256": "11d9lrybhqi85lxr7gf8s4zxgbclnjiwn0w1mga3lsh9nnf50a4a", + "rev": "a9317711507b094b2049b42356646dd5764bca06", + "date": "2022-08-28T14:37:52+02:00", + "path": "/nix/store/cq018zk73bw5163ch7p52kkxiqd0yz0y-tree-sitter-elm", + "sha256": "1ml93yj9ns6pxzhk0l4hiwfp9h9s1ad3cpwdnpmbgyc0fgaqzjf9", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 78a928de0349..e35645a0fa2b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "8a3571fc4a702b216ff918a08c9c5895df7ea06c", - "date": "2022-05-12T18:32:55+01:00", - "path": "/nix/store/vyfppzpljszmwwrk1gdg132c4nswy048-tree-sitter-fish", - "sha256": "1svca1agsr29ypn6pz44lwxg4b6a1k5qsm983czk3h16z5igka05", + "rev": "84436cf24c2b3176bfbb220922a0fdbd0141e406", + "date": "2022-08-21T20:31:28+01:00", + "path": "/nix/store/mf86jwsgjr0jdsdp88haqlqhfnpwvsh9-tree-sitter-fish", + "sha256": "12s3db2mg9qa8l1i4a5h59kd7kl5j83wyl5kzq7j2k56xmvq56x0", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 509d7b90778c..fc41dc951c96 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "57652a006b726251ae4d03862ffecbe39b1515bf", - "date": "2022-07-10T20:32:50+02:00", - "path": "/nix/store/n3rfnc7z8ps4jzgxyb9hv9kffb2alcmw-tree-sitter-glsl", - "sha256": "1iayzjbwfmjbak3igrgms7wpa58syy2xym6n2hpi3369v7rfgsg8", + "rev": "e594c182d9d55170ba01678e1fc534166a38e171", + "date": "2022-08-07T23:31:50-07:00", + "path": "/nix/store/cnfwwpml52i755k3k52r9c5sgpw57bmp-tree-sitter-glsl", + "sha256": "0pjy6d3fx973qf4waj80lkv03ws0sbmy4vpa9a1s72ws6y6c72in", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 74d8289dfa07..6c934af0d21b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "cf394604ae2ec2a5e65b1afbc7dea21258ede403", - "date": "2022-07-02T11:46:11+02:00", - "path": "/nix/store/04cbp4wc4ga3d36d9xvqz2wy9bdnyapv-tree-sitter-haskell", - "sha256": "1kvh5gwg3c59snqhpsg23b690rnbmcya0i38mqq9n1pdmv2pzxyi", + "rev": "1c89468614883e951db7d4ac05a56ec864f80bc1", + "date": "2022-08-22T12:22:27+02:00", + "path": "/nix/store/20yq98my5vdv12f76hyly2cc6b1d2dz3-tree-sitter-haskell", + "sha256": "1m94qx0gdcv31mskjxs884153qrz1jicajxph2wlp4wdpchl7gsp", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json index 71664391b230..62e3599536d4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ntbbloodbath/tree-sitter-http", - "rev": "bfddd16b1cf78e0042fd1f6846a179f76a254e20", - "date": "2021-11-04T16:44:58-04:00", - "path": "/nix/store/l776a8vyhzg64pzna22hy96cia71l1sq-tree-sitter-http", - "sha256": "0va7lxddkpbsjpbih4dwv6i9minnl2a4lq7i6dm3fk99c71y4ghg", + "rev": "30a9c1789d64429a830802cde5b1760ff1064312", + "date": "2022-08-21T21:33:18-04:00", + "path": "/nix/store/0zk2zzhhx9vsp7h7gsb57db5sk20p3ji-tree-sitter-http", + "sha256": "0gd3dv8kr0rzhagxi729fwjzsnipyxln823a4qfqr7lzzvmb14jy", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 4c8044e17ac7..2ad9d0209654 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "785831303ce3d36f5dd8ada7c4c7d63518d4d2f5", - "date": "2022-05-30T15:49:16+02:00", - "path": "/nix/store/jjxv4pcbnnvsbiplhjk91lxyx5mz8l0z-tree-sitter-javascript", - "sha256": "0hk9zy7jykq86x0k10060f2b7xrfai551avfz0qssq3b0j2h1m3g", + "rev": "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b", + "date": "2022-08-18T14:29:19+02:00", + "path": "/nix/store/y3ndi84v9y3li5vnfyyp9xhb8hsgsipf-tree-sitter-javascript", + "sha256": "1g252s51amn9w0j6wi4jk6zic9rbw8hajqhcdycq9ma4sqpvb5dr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 5312806c003e..781f05e06629 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "a041a547270c17f3d3aca11cb882f5c8eb88a572", - "date": "2022-07-07T14:08:02+06:00", - "path": "/nix/store/cs0rf42nnyw4w2rlzhw137iqh06dy5mh-tree-sitter-lua", - "sha256": "0db2wjwzzx40i38cs04w8pn0zqqv18ry4m2div0a0b2wgdhzf33f", + "rev": "c9ece5b2d348f917052db5a2da9bd4ecff07426c", + "date": "2022-07-16T17:09:45+06:00", + "path": "/nix/store/88rff0xq0hw7snlcf2kkvvrknnda6sgk-tree-sitter-lua", + "sha256": "11jhyll9w6ffd78nnr6d0y79x8r253wvxsflmq3nrhvwqvk2yarm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index b416bccb8123..3db130f311e0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "142a5b4a1b092b64c9f5db8f11558f9dd4009a1b", - "date": "2022-07-04T10:48:30+02:00", - "path": "/nix/store/wac43pvz3wdwl2i6a8a0ik6l99c9lzmq-tree-sitter-markdown", - "sha256": "0q1czdv7szw9rk4h9i9xjc29s0g3m1grhsjq6rl5vm70h998fbmg", + "rev": "e375ba95ff9a12418f9b9e7c190f549d08b5380a", + "date": "2022-08-05T11:11:58+02:00", + "path": "/nix/store/2mga5flf52j6m8v5gglmnammklyp4qw8-tree-sitter-markdown", + "sha256": "0ziciy95wgw8j0dimi79dpqg7ql6m1vzkygffmqqmmvap9zfhggb", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 33b3088227f9..8c267ad14bd1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "bc8a040492b56754a35b3b00a3052fdb7ba12969", - "date": "2022-06-27T11:07:56-04:00", - "path": "/nix/store/6xpvk9i1250slzsh2ap3pr0fawmibngw-tree-sitter-org", - "sha256": "19z45bd276g4xggg2vqmr6fjwyi88xmpx1ihqq908152pq83zmv6", + "rev": "698bb1a34331e68f83fc24bdd1b6f97016bb30de", + "date": "2022-08-16T11:52:06-04:00", + "path": "/nix/store/bixwb7s6ax1wygp2pmg1r4czgail0kq8-tree-sitter-org", + "sha256": "0adzb2kw8k3w75p5f3ax9lal64k8n2fwrmrqak2z2w8jl8cgagl6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 8b4175a4f3cc..aaf8f656bed1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "bbf86084d9b7eb4768f3fb9fe094b3e0600057b1", - "date": "2022-02-26T01:42:56+05:30", - "path": "/nix/store/cpsi8sjl3d1v5sg2rcsw3arf7zwm4l06-tree-sitter-perl", - "sha256": "037kdl6kq47p35qd3p6j4560x6w24zzmjxnz2fkd28xrm0lsh9lm", + "rev": "ff5c3108083af6fcb7575e32a7558b8165a05bcd", + "date": "2022-07-18T20:23:41+05:30", + "path": "/nix/store/29ijys20vg6qyc2999vjiylwi9nrq3y4-tree-sitter-perl", + "sha256": "1zsffd55sldc1148wyjm0kh8knm4849wgwvdvwhchpzn6ji6yf8i", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json index 786fec353d5f..b1fda958c6af 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rolandwalker/tree-sitter-pgn", - "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a", - "date": "2021-08-25T17:57:38-04:00", - "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn", - "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq", + "rev": "4c372e9e4d69bdc57701201347afe5f6413f2367", + "date": "2021-09-14T07:33:59-04:00", + "path": "/nix/store/62pvfyg8qlybxmd8kac8fdpycsypga67-tree-sitter-pgn", + "sha256": "0c2iqv93fg2pl7ixa7bby0bgnfnd8djjkjcg7d9bn3y7vpswvbvi", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 98dcf351a7bf..2fb56e502f38 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "ece74b20942a5b23acaf3622512c6d0db1491a7e", - "date": "2022-06-24T15:38:28-07:00", - "path": "/nix/store/cqqyvb0vfp0q34lf3w5jds5dq4riac9z-tree-sitter-php", - "sha256": "0ggx747j3hpgwqw7cjh07n866mvdcyv3mvblffbrb8b1xn3bll84", + "rev": "670d1eb6822d8c7ade1c71232e0bef42757b9da7", + "date": "2022-07-16T12:25:05+02:00", + "path": "/nix/store/swkym10m39vwrhvknv5x2wsx2qml6w13-tree-sitter-php", + "sha256": "01kkds6nac4b8xb4y4qsndg2z9y2ikr4j7brrs28aw8rzw0qlqf0", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json new file mode 100644 index 000000000000..0ce9862c5c30 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme", + "rev": "ad0c1485aa1e61b727a986d82c7fab4cd21ca723", + "date": "2022-07-22T15:14:16+00:00", + "path": "/nix/store/13yzcd1k87sfxdac4cdj8pvqv06wal6i-tree-sitter-ql-dbscheme", + "sha256": "0glj3j9m4wsmfgahsjzhzp34scxrwpwjqkzgj0i72rn23869xjip", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 66359662e7c6..d7fcdc683b20 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "b2c2364e833cc9f1afa243ac367f1475330fef63", - "date": "2022-05-04T13:16:04-04:00", - "path": "/nix/store/8c01j930llm5wacj2727k8igwwyhbcz4-tree-sitter-ql", - "sha256": "1a4k4rmyqqcj94y57sf2h27bbkn921p1ifl2xwcqpmk6dr6n5bbr", + "rev": "bd087020f0d8c183080ca615d38de0ec827aeeaf", + "date": "2022-08-17T11:53:16+02:00", + "path": "/nix/store/id24yb922kcjnqx160b5hga65k9zmnkh-tree-sitter-ql", + "sha256": "18yv6sag794k0l7i0wxaffxhay6zgwnap5bbhi48h04q1cvas0yr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index 7540751ab7ab..3effe0bf62a5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -1,9 +1,9 @@ { "url": "https://github.com/FallenAngel97/tree-sitter-rego", - "rev": "6bf5f8878bef2fb760508bff1ce0262a31925018", - "date": "2022-04-23T19:59:01+03:00", - "path": "/nix/store/gnbksy85s2z7b8c02im8liaa1d7g07my-tree-sitter-rego", - "sha256": "1ly2lhk4mfqmsg3pzv21ikzsxaz39bah3sgd3lcbaiqd0zzgbzks", + "rev": "6d70da3a998fd0081efc5d1019c71e74cc1568e9", + "date": "2022-08-17T15:53:32+03:00", + "path": "/nix/store/r23jy7qfsl6snbp0z7p5lk9x0q9ssgzs-tree-sitter-rego", + "sha256": "1phjhrngv818mcwvbrfpi0hrzc05cjckds5ddmndc8h7wi0db9cb", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index ae10412d474b..5d58925b7077 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-rst", - "rev": "d4b6c33ec15a4c22d0003dd37a5b20baa352b843", - "date": "2022-06-13T13:46:50-05:00", - "path": "/nix/store/scmhiai4dfc8k7nw6f0j1nmdhzv2j1ji-tree-sitter-rst", - "sha256": "127g78x2macl5fc1vhkfgkkd3zzj1yv9m2067j53nrivaff3jj8d", + "rev": "25e6328872ac3a764ba8b926aea12719741103f1", + "date": "2022-08-26T17:09:42-05:00", + "path": "/nix/store/y831a05hzw8dsajijwkahgwwcf4ima8l-tree-sitter-rst", + "sha256": "0f53jmpjh2kcl9srwwwb7a5k24729ig96m87qjj99myqfnzahw43", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 86320373d7ea..6a058d326982 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", - "date": "2021-03-03T16:54:30-08:00", - "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", - "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "rev": "ad1043283b1f9daf4aad381b6a81f18a5a27fe7e", + "date": "2022-08-24T18:08:57+02:00", + "path": "/nix/store/mkg79bscx68yirm7avhlspfwqz3snqvl-tree-sitter-ruby", + "sha256": "0x4j2z18gf40snhyb416s9l5a2r9jjmki8v57wqldvkm39cvhm4z", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 9dcd2a657e7d..73572f033d83 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "0f14a10011ac6e56f309fb99a94829c3312b743a", - "date": "2022-07-11T12:34:08-04:00", - "path": "/nix/store/9767f79glbdja848ri2i0vii41g3z84n-tree-sitter-rust", - "sha256": "15js3v1kyl7h34ichy5q6zs5n0sm2b0iwgfdh34jrcgnlbvbgy52", + "rev": "47b061c1e1ba3a7e9c2f450363a50e87de3f7c61", + "date": "2022-08-18T13:07:47+02:00", + "path": "/nix/store/db0s8jdi3r07y0wsv7a6kkvzrfgnjqqz-tree-sitter-rust", + "sha256": "106406hm5aqwj6p2h70p542dgphian46rw98gj5yf82p1h0k38dz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json index d12ff52a5563..445a0c6847ef 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-surface", - "rev": "21b7676859c1187645a27ff301f76738af5dfd44", - "date": "2021-08-15T10:33:50-07:00", - "path": "/nix/store/7i1klj80jbcvwgad7nrbcs7hvn68f125-tree-sitter-surface", - "sha256": "122v1d2zb0w2k5h7xqgm1c42rwfrp59dzyb2lly7kxmylyazmshy", + "rev": "f4586b35ac8548667a9aaa4eae44456c1f43d032", + "date": "2022-01-18T18:13:51-08:00", + "path": "/nix/store/l1nzhnhw1219140vzwvillawr7m9sz22-tree-sitter-surface", + "sha256": "085yvq2m4dbhhn51ndhzvgfmpp3hqiwk1a39xpjy4lxgrhbyjzqn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 30052fe6407a..e1f3f4990cbd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "84c90ee15f851e1541c25c86e8a4338f5b4d5af2", - "date": "2022-04-13T11:35:15+05:30", - "path": "/nix/store/2miakcpw7xgg2pcwdbcg0kl2djijcfbj-tree-sitter-svelte", - "sha256": "0hidafgzbnksyigksab8731jdnvj1vqn7fv0jxsc1yfrwrmai6ls", + "rev": "52e122ae68b316d3aa960a0a422d3645ba717f42", + "date": "2022-07-08T23:25:40+05:30", + "path": "/nix/store/lqis7h7db9bq7g063l60q7361h718z56-tree-sitter-svelte", + "sha256": "1pbs508ly4dlppnpa5657j0zsi7fdd6azvxjk7dayxznbygnj900", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index 2ffc311fd943..1c190bf9f1d0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f", - "date": "2022-02-03T12:27:54-05:00", - "path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus", - "sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq", + "rev": "deaf0e5c573ad4e2bbfc9a29abb7b6dcb572556e", + "date": "2022-07-26T16:48:02-04:00", + "path": "/nix/store/40jlhkwlrvzdg3s95w132kvs5rax8mbj-tree-sitter-tlaplus", + "sha256": "01nsi5403vxcc725x9rvd0ff6xfkg2lw5350i1w5998jbs9kd00g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 58bd0d8f8074..2e018665e8df 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "49e82b1bce36d6046df911901684cd66b5345d58", - "date": "2022-07-06T12:52:21-07:00", - "path": "/nix/store/wzkgvx1sj0js8sdkm8cmip4rmsgqy3ij-tree-sitter-typescript", - "sha256": "1kgl0dvcjzlbpfbdf1mq9693p5j7kvcqfmxis2w30js2lmrp0wgb", + "rev": "082da44a5263599186dadafd2c974c19f3a73d28", + "date": "2022-08-25T11:07:19-07:00", + "path": "/nix/store/b84c7mhjj9dm3ccfwp9h2q1ac9k2axv1-tree-sitter-typescript", + "sha256": "0y1c4bldgmhbhll629xks5y3c9l8dq29na75y3n0hfwivrpry8rx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 7777e3c7e45c..2e579b6dfad4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "2d75bf329e3df6e1c13f81262567b9aeb6c241d1", - "date": "2022-07-12T08:30:33+02:00", - "path": "/nix/store/l19kbw907jxk26qf5cl5w5nz17sywjf6-tree-sitter-viml", - "sha256": "1pc6s2pc4svk64imkc486nz8fkhkpmwamn17gvnblinsjxr8369y", + "rev": "d38ee3b8ea625591a0dc009d6691118517205685", + "date": "2022-08-27T12:10:49+02:00", + "path": "/nix/store/gl64rifl6x0c0g32fpzwk7kscwbzvxnk-tree-sitter-viml", + "sha256": "1mvmg0vssydmgkwgb4blgiwbiqiw5233l58hrqmcgfz4vg4yazr7", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 1366f0c57f4d..4f778429b11c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -39,6 +39,7 @@ let "tree-sitter-verilog" "tree-sitter-jsdoc" "tree-sitter-ql" + "tree-sitter-ql-dbscheme" "tree-sitter-embedded-template" "tree-sitter-tsq" "tree-sitter-toml" diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 2eb28d8b36f2..02b8c4e75b92 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.4.0"; + version = "0.4.2"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-AaSl++/i00YAvmvaUSEwLLpItYACtmWEFTuUngl7rkI="; + sha256 = "sha256-lx2IQ3NpFuVr4Vb7vFcp/QVZBlLzi4VXFE7Sw3LKIXE="; }; - vendorSha256 = "sha256-qpZ3RsBOkWqLCDK11vBGkAZJBC7T8hmpmm4ccGeWBus="; + vendorSha256 = "sha256-7kDl7gyKFM2gErDhOBCo6T4etwsAJnRpVtaJgv6BefM="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 99a19d12405f..92086a575621 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.15.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-IwtAd8qhG7FgnC7esipwAbSssVKIirB6GCedgNRPabo="; + sha256 = "sha256-yTzLEV4yP6It4KrUPdTgIJrocW+VToOeyaSvOSQRVMU="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-asWf+wIOpbZx9YOw5c4prg2D6FSRCTcc5FgWY93MNII="; + cargoSha256 = "sha256-y9o2sNiDIYKzrsgG+tA17PswR6DZn7ms8n5EG/J9oOU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index f2b9ec4937ca..f51837cd3410 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.14.0"; + version = "0.15.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OFWmrwZdyvIhyKsWEfaU7wHIqeuNhjwZQkwKTccBnTI="; + sha256 = "sha256-3DBpvsjreBJz6NPHJsPV3dK+PvAvdwz7/gp9p/zBieI="; }; - cargoSha256 = "sha256-nubWXEG8XmX2t7WsNvbcDpub5H1x5467cSFRvs8PEpQ="; + cargoSha256 = "sha256-sP3oMphy+jbs8NUqyvanWHyDtEoFaUVQHKeTbOLfTH0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 7e234eef66c3..383a6534671b 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -3,20 +3,29 @@ , rustPlatform , lua52Support ? true , luauSupport ? false +, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FqtpMRR647YiIIduIf37rKewytXgRl01OCmBUXd/44k="; + sha256 = "sha256-l4q6Qlgdxgm4K5+NkWMZI3Hhtx6m/0DG9PE4gvo/ylo="; }; - cargoSha256 = "sha256-Z5W1eJUHFFuHRSemXspW3gUhiAieyUg/6lIVvqAL/Oo="; + cargoSha256 = "sha256-zlk9KdiSKWknyuJTTqpzCeSJUXJGDK2A0g1ss8AHoYs="; + + cargoPatches = [ + # fixes broken 0.14.3 lockfile + (fetchpatch { + url = "https://github.com/JohnnyMorganz/StyLua/commit/834f632f67af6425e7773eaade8d23a880946843.patch"; + sha256 = "sha256-oM2gaILwiNMqTGFRQBw6/fxbjljNWxeIb0lcXcAJR3w="; + }) + ]; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2e4dccbed2da..a44650a9daf6 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.377"; + version = "0.0.383"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-L8wOhs7jL+nby2NTPQGweGTKBYnXFKnfi7boFBOeSTs="; + sha256 = "sha256-SI+Xm4TUn4HmfbTG0YQuwQhCSVcean8PsOx5SowI/eU="; }; - vendorSha256 = "sha256-E6QeWu88MXMMfZAM7vMIGXpJQuduX6GTj3tXvlE9hFo="; + vendorSha256 = "sha256-swbQOLW3NMVDbD1hJh7iFKAFWlQhWSY2KHQGj5NSdqw="; subPackages = [ "." ]; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index da72db16437f..daadd1d8c32f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-ghWWoAySJsiYmpdoFZIQrHSV7kOQe0kDQrONwgqFMzY="; + sha256 = "sha256-kFlMC94+g9I7qzyaslU3RJ4jKtDHRZAei/yD1+8q2Hs="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 4aaae2701451..aab92c6bb44e 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,12 +15,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2022.3.0"; + version = "2022.5.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-Y+M9nnJEE8FSrD58Q+spjICqV8zoc7Y2eVJLH/8qYDE="; + sha256 = "sha256-ExdfXfpimM6E/S6xiLTHdq3f4/ydtyfZ2+9o32z87gc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index ff3d20f16dab..57892920c8d7 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -23,8 +23,9 @@ perlPackages.buildPerlPackage { sed -i '/p2_mp4h\/doc/d' Makefile.in ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; - [ perl TermReadKey GD BitVector ncurses lynx makeWrapper ImageSize ]; + [ perl TermReadKey GD BitVector ncurses lynx ImageSize ]; patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; diff --git a/pkgs/games/everspace/default.nix b/pkgs/games/everspace/default.nix new file mode 100644 index 000000000000..157a3bf45e93 --- /dev/null +++ b/pkgs/games/everspace/default.nix @@ -0,0 +1,102 @@ +{ + # Packaging Dependencies + lib, stdenv, requireFile, autoPatchelfHook, unzip, + + # Everspace Dependencies + cairo, gdk-pixbuf, pango, gtk2-x11, libGL, openal, + + # Unreal Engine 4 Dependencies + xorg +}: + +# Known issues: +# - Video playback (upon starting a new game) does not work (screen is black) +stdenv.mkDerivation { + pname = "everspace"; + version = "1.3.5.3655"; + + src = requireFile { + name = "everspace_1_3_5_3655_32896.sh"; + url = "https://www.gog.com/"; + sha256 = "0jlvxq14k1pxmbr08y8kar0ijlqxcnkfqlvw883j96v9zr34ynj3"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + buildInputs = [ + cairo + gdk-pixbuf + pango + gtk2-x11 + openal + stdenv.cc.cc.lib + ]; + + runtimeDependencies = [ + libGL + + # ue4 + xorg.libX11 + xorg.libXScrnSaver + xorg.libXau + xorg.libXcursor + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXxf86vm + xorg.libxcb + ]; + + unpackPhase = '' + runHook preUnpack + + # The shell script contains a zip file. Unzipping it works but will result + # in some error output and an error exit code. + unzip "$src" || true + + runHook postUnpack + ''; + + postPatch = '' + ## Remove Bundled Libs ## + + # vlc libs + # + # TODO: This is probably what breaks video playback. It would be cleaner + # to remove the bundled libs and replace them with system libs but there + # are so many. Copy-pasting the list from the vlc package is a good start + # but still leaves us with many unresolved dependencies. + rm -rf ./data/noarch/game/RSG/Plugins/VlcMedia + + # openal + rm -rf ./data/noarch/game/Engine/Binaries/ThirdParty/OpenAL + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/opt" + cp -r "./data/noarch" "$out/opt/everspace" + + mkdir -p "$out/bin" + ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace" + + runHook postInstall + ''; + + meta = with lib; { + description = "Action-focused single-player space shooter with roguelike elements"; + homepage = "https://classic.everspace-game.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ jtrees ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix new file mode 100644 index 000000000000..5d88e8777e63 --- /dev/null +++ b/pkgs/games/forge-mtg/default.nix @@ -0,0 +1,95 @@ +{ coreutils +, fetchFromGitHub +, gnused +, lib +, maven +, makeWrapper +, openjdk +, stdenv +}: + +let + version = "1.6.53"; + + src = fetchFromGitHub { + owner = "Card-Forge"; + repo = "forge"; + rev = "forge-${version}"; + sha256 = "sha256-tNPG90mw8HZjp37YJ9JQlOBiVNPRo6xuNur651Adva8="; + }; + + # launch4j downloads and runs a native binary during the package phase. + patches = [ ./no-launch4j.patch ]; + + mavenRepository = stdenv.mkDerivation { + pname = "forge-mtg-maven-repository"; + inherit version src patches; + + nativeBuildInputs = [ maven ]; + + buildPhase = '' + runHook preBuild + # Tests need a running Xorg. + mvn package -Dmaven.repo.local=$out -DskipTests + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + find $out -type f \( \ + -name \*.lastUpdated \ + -o -name resolver-status.properties \ + -o -name _remote.repositories \) \ + -delete + runHook postInstall + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-6FTbYXaF3rBIZov2WJxjG/ovmvimjXFPaFchAduVzI8="; + }; + +in stdenv.mkDerivation { + pname = "forge-mtg"; + inherit version src patches; + + nativeBuildInputs = [ maven makeWrapper ]; + + buildPhase = '' + runHook preBuild + # Tests need a running Xorg. + mvn --offline -Dmaven.repo.local=${mavenRepository} -DskipTests package; + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -pv $out/{bin,share/forge} + cp -av \ + forge-gui-desktop/target/forge.sh \ + forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \ + forge-adventure/target/forge-adventure.sh \ + forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \ + forge-gui/res \ + $out/share/forge + runHook postInstall + ''; + + preFixup = '' + for commandToInstall in forge forge-adventure; do + chmod 555 $out/share/forge/$commandToInstall.sh + makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \ + --prefix PATH : ${lib.makeBinPath [ coreutils openjdk gnused ]} \ + --set JAVA_HOME ${openjdk}/lib/openjdk \ + --set SENTRY_DSN "" + done + ''; + + meta = with lib; { + description = "Magic: the Gathering card game with rules enforcement"; + homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26"; + platforms = openjdk.meta.platforms; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ eigengrau ]; + }; +} diff --git a/pkgs/games/forge-mtg/no-launch4j.patch b/pkgs/games/forge-mtg/no-launch4j.patch new file mode 100644 index 000000000000..ea4d674be170 --- /dev/null +++ b/pkgs/games/forge-mtg/no-launch4j.patch @@ -0,0 +1,333 @@ +diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml +index 4d81b150e0..80dd1e04cb 100644 +--- a/forge-adventure/pom.xml ++++ b/forge-adventure/pom.xml +@@ -41,131 +41,6 @@ + + + +- +- com.akathist.maven.plugins.launch4j +- launch4j-maven-plugin +- 1.7.25 +- +- +- l4j-adv +- package +- +- launch4j +- +- +- gui +- ${project.build.directory}/forge-adventure-java8.exe +- ${project.build.finalName}-jar-with-dependencies.jar +- true +- forge +- src/main/config/forge-adventure.ico +- +- forge.adventure.Main +- false +- anything +- +- +- 1.8.0 +- 4096 +- +- -Dfile.encoding=UTF-8 +- +- +- +- +- 1.0.0.0 +- +- +- 1.0.0.0 +- +- Forge +- Forge +- +- 1.0.0.0 +- +- +- 1.0.0.0 +- +- forge-adventure +- forge-adventure +- forge-adventure-java8.exe +- +- +- +- +- +- l4j-adv2 +- package +- +- launch4j +- +- +- gui +- ${project.build.directory}/forge-adventure.exe +- ${project.build.finalName}-jar-with-dependencies.jar +- true +- forge +- https://www.oracle.com/java/technologies/downloads/ +- src/main/config/forge-adventure.ico +- +- forge.adventure.Main +- false +- anything +- +- +- 11.0.1 +- jdkOnly +- 4096 +- +- -Dfile.encoding=UTF-8 +- --add-opens java.base/java.lang=ALL-UNNAMED +- --add-opens java.base/java.math=ALL-UNNAMED +- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED +- --add-opens java.base/java.nio=ALL-UNNAMED +- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED +- --add-opens java.base/java.util=ALL-UNNAMED +- --add-opens java.base/java.lang.reflect=ALL-UNNAMED +- --add-opens java.base/java.text=ALL-UNNAMED +- --add-opens java.desktop/java.awt=ALL-UNNAMED +- --add-opens java.desktop/java.awt.font=ALL-UNNAMED +- --add-opens java.desktop/java.awt.image=ALL-UNNAMED +- --add-opens java.desktop/java.awt.color=ALL-UNNAMED +- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED +- --add-opens java.desktop/javax.swing=ALL-UNNAMED +- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED +- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED +- --add-opens java.desktop/sun.swing=ALL-UNNAMED +- --add-opens java.desktop/java.beans=ALL-UNNAMED +- --add-opens java.base/java.util.concurrent=ALL-UNNAMED +- --add-opens java.base/java.net=ALL-UNNAMED +- -Dio.netty.tryReflectionSetAccessible=true +- +- +- +- +- 1.0.0.0 +- +- +- 1.0.0.0 +- +- Forge +- Forge +- +- 1.0.0.0 +- +- +- 1.0.0.0 +- +- forge-adventure +- forge-adventure +- forge-adventure.exe +- +- +- +- +- +- +- + + com.google.code.maven-replacer-plugin + replacer +diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml +index 218e641096..e8d0905a3d 100644 +--- a/forge-gui-desktop/pom.xml ++++ b/forge-gui-desktop/pom.xml +@@ -231,60 +231,6 @@ + windows-linux-release + + +- +- com.akathist.maven.plugins.launch4j +- launch4j-maven-plugin +- 2.1.2 +- +- +- l4j-gui +- package +- +- launch4j +- +- +- gui +- ${project.build.directory}/forge-java8.exe +- ${project.build.finalName}-jar-with-dependencies.jar +- true +- forge +- src/main/config/forge.ico +- +- forge.view.Main +- false +- anything +- +- +- 1.8.0 +- 4096 +- +- -Dfile.encoding=UTF-8 +- +- +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- Forge +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- forge +- forge-java8.exe +- +- +- +- +- +- + + org.apache.maven.plugins + maven-antrun-plugin +@@ -396,131 +342,6 @@ + windows-linux + + +- +- com.akathist.maven.plugins.launch4j +- launch4j-maven-plugin +- 2.1.2 +- +- +- l4j-gui +- package +- +- launch4j +- +- +- gui +- ${project.build.directory}/forge-java8.exe +- ${project.build.finalName}-jar-with-dependencies.jar +- true +- forge +- src/main/config/forge.ico +- +- forge.view.Main +- false +- anything +- +- +- 1.8.0 +- 4096 +- +- -Dfile.encoding=UTF-8 +- +- +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- Forge +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- forge +- forge-java8.exe +- +- +- +- +- +- l4j-gui2 +- package +- +- launch4j +- +- +- gui +- ${project.build.directory}/forge.exe +- ${project.build.finalName}-jar-with-dependencies.jar +- true +- forge +- https://www.oracle.com/java/technologies/downloads/ +- src/main/config/forge.ico +- +- forge.view.Main +- false +- anything +- +- +- 11.0.1 +- jdkOnly +- 4096 +- +- -Dfile.encoding=UTF-8 +- --add-opens java.base/java.lang=ALL-UNNAMED +- --add-opens java.base/java.math=ALL-UNNAMED +- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED +- --add-opens java.base/java.nio=ALL-UNNAMED +- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED +- --add-opens java.base/java.util=ALL-UNNAMED +- --add-opens java.base/java.lang.reflect=ALL-UNNAMED +- --add-opens java.base/java.text=ALL-UNNAMED +- --add-opens java.desktop/java.awt=ALL-UNNAMED +- --add-opens java.desktop/java.awt.font=ALL-UNNAMED +- --add-opens java.desktop/java.awt.image=ALL-UNNAMED +- --add-opens java.desktop/java.awt.color=ALL-UNNAMED +- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED +- --add-opens java.desktop/javax.swing=ALL-UNNAMED +- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED +- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED +- --add-opens java.desktop/sun.swing=ALL-UNNAMED +- --add-opens java.desktop/java.beans=ALL-UNNAMED +- --add-opens java.base/java.util.concurrent=ALL-UNNAMED +- --add-opens java.base/java.net=ALL-UNNAMED +- -Dio.netty.tryReflectionSetAccessible=true +- +- +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- Forge +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- +- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 +- +- Forge +- forge +- forge.exe +- +- +- +- +- +- +- + + org.apache.maven.plugins + maven-antrun-plugin diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index fa6b46e0751f..e141b68e88d3 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -18,7 +18,7 @@ let in buildEnv { name = "frogatto-${version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ engine data desktopItem ]; pathsToLink = [ "/bin" diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 6a21a74f70b4..52949cf18aae 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK - glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 0d5ea528a92d..4b2509275269 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ SDL2 - makeWrapper ]; configurePhase = '' diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix index 0c991d727e28..3957bf4fc1bc 100644 --- a/pkgs/games/space-cadet-pinball/default.nix +++ b/pkgs/games/space-cadet-pinball/default.nix @@ -33,11 +33,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ SDL2 SDL2_mixer - makeWrapper ] ++ lib.optional stdenv.isDarwin Cocoa; # Darwin needs a custom installphase since it is excluded from the cmake install diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 537a3f83a036..706fd23c65c6 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ln -s ${tracks} data/tracks ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost ogre @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ois SDL2 libvorbis - makeWrapper enet libXcursor bullet diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 49b07f3ad654..50cc97de1f3e 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.19.14"; + version = "4.2.5-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-Q0OiXjqZ6RmQg3Ob6k4NjaHsc+K50a0bAGBaaaUcP3I="; + sha256 = "sha256-xrFC2HU74+ehoaCZ5Dfgcxq67h6d97/6jtNXIkP4yEQ="; }; dontUnpack = true; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 8b0ff1ca989d..e1d090f5d3d1 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -33,15 +33,15 @@ }: let - version = "0.52.1"; - binary-deps-version = "5"; + version = "0.53.1"; + binary-deps-version = "6"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-zNysAPPnnWO31K81oFiKHF4IStraveOlYwRqa1yyOLo="; + sha256 = "sha256-AWXuPXOhhPfdDrcyZF5o7uBnieSCGhwCzOYN8MjgTl8="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ let src = fetchzip { url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "sha256-N/zkUhPFnU15QSe4NGmVLmhU7UslYrzz9ZUWuLbydyE="; + sha256 = "sha256-ERfg89oTf9JTtv/qRnTRIzFP+zMpHT8W4WAIxqogy9E="; }; dontPatchELF = true; @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-/dPr3ASNew1naB9FLcZ70jZtqQXWRflUmr4jsnRskiA="; + outputHash = "sha256-+mO4HQwFfy7SeGrN4R52KOr/uNQXkHMvYir3k0l5rDo="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; @@ -140,24 +140,6 @@ in stdenv.mkDerivation rec { chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ ''; - patches = [ - (fetchpatch { - name = "fix-sdl-eventqueue-part1.patch"; - url = "https://github.com/DaemonEngine/Daemon/commit/3a978c485f2a7e02c0bc5aeed2c7c4378026cb33.patch"; - sha256 = "sha256-wVDscGf5zOOmivItNK913l0cfNFR6RpApewrxbmfG8s="; - stripLen = 1; - extraPrefix = "daemon/"; - }) - (fetchpatch { - name = "fix-sdl-eventqueue-part2.patch"; - url = "https://github.com/DaemonEngine/Daemon/commit/54f98909c8871a57efb40263b215b81f22010b22.patch"; - sha256 = "sha256-9qlyJnUEyZgFaclpXthKHm3qq+cW4E4LMOpLukcwBCU="; - stripLen = 1; - extraPrefix = "daemon/"; - excludes = [ "*/CMakeLists.txt" ]; - }) - ]; - nativeBuildInputs = [ cmake unvanquished-binary-deps diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 2d28090c595c..ee6748676bd3 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca"; }; - buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext - fontconfig makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext fontconfig ]; configureFlags = [ "--enable-alternate-scoresdir=scores" diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index fdf4f163ba85..e44c9634b0f4 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.12"; + version = "1.28.15"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "sha256-RuLqPYhK0iK7hjzmUR5ZzzkO+Og1KVvkSoDlALKjOjo="; + sha256 = "sha256-qQfsdp+7cu+/v5tUCyUKCOM7bjc6inw0P5hA+6TQR4s="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index 2c51d20807db..6f28a9ce132e 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xssproxy"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "timakro"; + owner = "vincentbernat"; repo = "xssproxy"; rev = "v${version}"; - sha256 = "sha256-xaFr+AM5GdTZQsN1g8QsXgzsfve9GoteiXHpoMvwEBg="; + sha256 = "sha256-BE/v1CJAwKwxlK3Xg3ezD+IXyT7ZFGz3bQzGxFQfEnU="; }; nativeBuildInputs = [ pkg-config ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; - homepage = "https://github.com/timakro/xssproxy"; + homepage = "https://github.com/vincentbernat/xssproxy"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix new file mode 100644 index 000000000000..6444c7f0e0ff --- /dev/null +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchurl, cpio, xar, undmg }: + +stdenv.mkDerivation rec { + pname = "karabiner-elements"; + version = "14.8.0"; + + src = fetchurl { + url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${version}/Karabiner-Elements-${version}.dmg"; + sha256 = "sha256-sQJgK3EoJf8wcr0iL9iZXl6NJArptUDTrDeNKwgEfuM="; + }; + + outputs = [ "out" "driver" ]; + + nativeBuildInputs = [ cpio xar undmg ]; + + unpackPhase = '' + undmg $src + xar -xf Karabiner-Elements.pkg + cd Installer.pkg + zcat Payload | cpio -i + cd ../Karabiner-DriverKit-VirtualHIDDevice.pkg + zcat Payload | cpio -i + cd .. + ''; + + sourceRoot = "."; + + postPatch = '' + for f in *.pkg/Library/Launch{Agents,Daemons}/*.plist; do + substituteInPlace $f \ + --replace "/Library/" "$out/Library/" + done + ''; + + installPhase = '' + mkdir -p $out $driver + cp -R Installer.pkg/Applications Installer.pkg/Library $out + cp -R Karabiner-DriverKit-VirtualHIDDevice.pkg/Applications Karabiner-DriverKit-VirtualHIDDevice.pkg/Library $driver + + cp "$out/Library/Application Support/org.pqrs/Karabiner-Elements/package-version" "$out/Library/Application Support/org.pqrs/Karabiner-Elements/version" + ''; + + meta = with lib; { + description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later."; + homepage = "https://karabiner-elements.pqrs.org/"; + platforms = platforms.darwin; + maintainers = with maintainers; [ Enzime ]; + license = licenses.unlicense; + }; +} diff --git a/pkgs/os-specific/linux/asus-ec-sensors/default.nix b/pkgs/os-specific/linux/asus-ec-sensors/default.nix index f046ec206ab6..c80f18a78ece 100644 --- a/pkgs/os-specific/linux/asus-ec-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-ec-sensors/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "asus-ec-sensors-${version}-${kernel.version}"; - version = "unstable-2021-12-16"; + version = "unstable-2022-07-10"; src = fetchFromGitHub { owner = "zeule"; repo = "asus-ec-sensors"; - rev = "3621741c4ecb93216d546942707a9c413e971787"; - sha256 = "0akdga2854q3w0pyi0jywa6cxr32541ifz0ka1hgn6j4czk39kyn"; + rev = "5fbdd1461dc88fc952e02717b8120438ce5558b3"; + sha256 = "sha256-kBGl8i7HzdItMoM7L91OfX6y+bqDfd22WICRg0n25pI="; }; hardeningDisable = [ "pic" ]; @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nickhu ]; + broken = kernel.kernelOlder "5.11"; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index ac8efbb7969f..bf7cb025bc1c 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.16"; + version = "5.19"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TETkJ2L5A/kJS6WlmJmMgAqXpir9b9MeweCnmeMIZZw="; + sha256 = "sha256-8We76UfdU7uevAwdzvXbatc6wdYITyxvk3bFw2DMTU4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a859d7eea4f1..8211860b62f5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -394,6 +394,10 @@ let EXT4_FS_SECURITY = yes; EXT4_ENCRYPTION = option yes; + NTFS_FS = whenAtLeast "5.15" no; + NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; + NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes; + REISERFS_FS_XATTR = option yes; REISERFS_FS_POSIX_ACL = option yes; REISERFS_FS_SECURITY = option yes; @@ -874,6 +878,9 @@ let SCSI_LOGGING = yes; # SCSI logging facility SERIAL_8250 = yes; # 8250/16550 and compatible serial support + SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; + SLAB_FREELIST_RANDOM = whenAtLeast "4.10" yes; + SLIP_COMPRESSED = yes; # CSLIP compressed headers SLIP_SMART = yes; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e38db853ff45..9ccfe53f1b07 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -36,11 +36,6 @@ let # AMD P-state driver X86_AMD_PSTATE = yes; - # Paragon's NTFS3 driver - NTFS3_FS = module; - NTFS3_LZX_XPRESS = yes; - NTFS3_FS_POSIX_ACL = yes; - # Google's BBRv2 TCP congestion Control TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index f48895fc017e..fb44fba22f5b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -1,31 +1,37 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoreconfHook +, fetchpatch +, meson , libtsm , systemd , libxkbcommon , libdrm -, libGLU, libGL +, libGLU +, libGL , pango , pixman , pkg-config , docbook_xsl , libxslt +, mesa +, ninja }: stdenv.mkDerivation rec { pname = "kmscon"; - version = "unstable-2018-09-07"; + version = "9.0.0"; src = fetchFromGitHub { owner = "Aetf"; repo = "kmscon"; - rev = "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"; - sha256 = "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"; + rev = "v${version}"; + sha256 = "sha256-8owyyzCrZVbWXcCR+RA+m0MOrdzW+efI+rIMWEVEZ1o="; }; buildInputs = [ - libGLU libGL + libGLU + libGL libdrm libtsm libxkbcommon @@ -33,14 +39,28 @@ stdenv.mkDerivation rec { pango pixman systemd + mesa ]; nativeBuildInputs = [ - autoreconfHook + meson + ninja docbook_xsl pkg-config ]; + patches = [ + (fetchpatch { + name = "0001-tests-fix-warnings.patch"; + url = "https://github.com/Aetf/kmscon/commit/b65f4269b03de580923ab390bde795e7956b633f.patch"; + sha256 = "sha256-ngflPwmNMM/2JzhV+hHiH3efQyoSULfqEywzWox9iAQ="; + }) + ]; + + # _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O" + + " -Wno-error=maybe-uninitialized"; # https://github.com/Aetf/kmscon/issues/49 + configureFlags = [ "--enable-multi-seat" "--disable-debug" diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 5edcd263f0d9..293425897e9d 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,10 +1,10 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome -, gobject-introspection }: +, gobject-introspection, librsvg }: python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.5.1"; + version = "0.7"; format = "other"; @@ -12,20 +12,25 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; + sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; }; nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome.adwaita-icon-theme python3 + gtk3 glib gnome.adwaita-icon-theme python3 librsvg ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; + mesonFlags = [ + "-Druntime-dependency-checks=false" + "-Dtests=false" + ]; + postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file - patchShebangs meson_install.sh + patchShebangs meson_install.sh data/generate-piper-gresource.xml.py ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 30f04c1eb8b3..03a5c0f4aeb4 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { pname = "rtl8812au"; - version = "${kernel.version}-5.9.3.2.20210427"; + version = "${kernel.version}-unstable-2022-08-22"; src = fetchFromGitHub { - owner = "gordboy"; - repo = "rtl8812au-5.9.3.2"; - rev = "6ef5d8fcdb0b94b7490a9a38353877708fca2cd4"; - sha256 = "sha256-czExf4z0nf7XEJ1YnRSB3CrGV6NTmUKDiZjLmrh6Hwo="; + owner = "morrownr"; + repo = "8812au-20210629"; + rev = "7aa0e0c74551b4e4f319f4b54e00ccbfe588b7ce"; + sha256 = "sha256-BHC1DpWHv/1UvSfj6S5fo/ODZ1VDgLQO2A9EC+BR1JE="; }; nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; - hardeningDisable = [ "pic" "format" ]; prePatch = '' @@ -46,10 +44,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; + homepage = "https://github.com/morrownr/8812au-20210629"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ fortuneteller2k ]; - broken = kernel.kernelOlder "4.10" || kernel.kernelAtLeast "5.15" || kernel.isHardened; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 091584a93cf4..87b5b81066c2 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = if withoutInitTools then "sysvtools" else "sysvinit"; - version = "3.01"; + version = "3.04"; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; - sha256 = "sha256-aLEaR3LNrM5ftlpMvq0ySizjmZ0Ti0/2HcLVnlfvV5M="; + sha256 = "sha256-KmIf5uRSi8kTCLdIZ92q6733dT8COVwMW66Be9K346U="; }; prePatch = '' diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index e59e37c0b3cf..f743b0024846 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "kernelshark"; - version = "2.1.0"; + version = "2.1.1"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"; rev = "kernelshark-v${version}"; - sha256 = "18yx8bp2996hiy026ncw2z5yfihvkjfl6m09y19yvs72crgvpyn8"; + sha256 = "sha256-1M35y3EkMHbGkVv93Xwo4zApvy9usIcz1spm5Z+1iUs="; }; outputs = [ "out" ]; diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix new file mode 100644 index 000000000000..a06e25b9eb8e --- /dev/null +++ b/pkgs/os-specific/linux/wiringpi/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, symlinkJoin +, fetchFromGitHub +}: + +let + version = "2.61-1"; + mkSubProject = { subprj # The only mandatory argument + , buildInputs ? [] + , src ? fetchFromGitHub { + owner = "WiringPi"; + repo = "WiringPi"; + rev = version; + sha256 = "sha256-VxAaPhaPXd9xYt663Ju6SLblqiSLizauhhuFqCqbO5M="; + } + }: stdenv.mkDerivation rec { + pname = "wiringpi-${subprj}"; + inherit version src; + sourceRoot = "source/${subprj}"; + inherit buildInputs; + # Remove (meant for other OSs) lines from Makefiles + preInstall = '' + sed -i "/chown root/d" Makefile + sed -i "/chmod/d" Makefile + ''; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=/." + # On NixOS we don't need to run ldconfig during build: + "LDCONFIG=echo" + ]; + }; + passthru = { + inherit mkSubProject; + wiringPi = mkSubProject { + subprj = "wiringPi"; + }; + devLib = mkSubProject { + subprj = "devLib"; + buildInputs = [ + passthru.wiringPi + ]; + }; + wiringPiD = mkSubProject { + subprj = "wiringPiD"; + buildInputs = [ + passthru.wiringPi + passthru.devLib + ]; + }; + gpio = mkSubProject { + subprj = "gpio"; + buildInputs = [ + passthru.wiringPi + passthru.devLib + ]; + }; + }; +in + +symlinkJoin { + name = "wiringpi-${version}"; + inherit passthru; + paths = [ + passthru.wiringPi + passthru.devLib + passthru.wiringPiD + passthru.gpio + ]; + meta = with lib; { + description = "Gordon's Arduino wiring-like WiringPi Library for the Raspberry Pi (Unofficial Mirror for WiringPi bindings)"; + homepage = "https://github.com/WiringPi/WiringPi"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/servers/asouldocs/default.nix new file mode 100644 index 000000000000..a10c088670b0 --- /dev/null +++ b/pkgs/servers/asouldocs/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "asouldocs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "asoul-sig"; + repo = "asouldocs"; + rev = "v${version}"; + hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g="; + }; + + vendorSha256 = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU="; + + meta = with lib; { + description = "Web server for multi-language, real-time synchronization and searchable documentation"; + homepage = "https://asouldocs.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ ivar anthonyroussel ]; + }; +} diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 0bcb47357dac..ee4900c41960 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-UB51Rd0AWEfj6qTfrRSWK/dq9MdLCqYoR/Gjwf65ZQk="; + sha256 = "sha256-iaFVYvMEgjNAvjesMPwBNNput5IyVlBxoFCoJ+HTCdI="; }; - vendorSha256 = "sha256-tgVImIfn1lPTYGXczoAxVta3L+VR0v13KowLIYQ7bwY="; + vendorSha256 = "sha256-KTux4XTIuyps5esvkEZIOfv3BTSU31kxxOeWeAavDMk="; # some tests are racy, re-enable once upstream has fixed them doCheck = false; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b8838b2bfcb5..1406cc7d7700 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.5"; + version = "9.18.6"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DO4HjXTwvcTsN0Q1Amsl3niS8mVAoYsioC73KKEdyuc="; + sha256 = "sha256-1DoP7QPHdNFoXSA1mCGMC3d0qI/MOQoBcHENX+t/v/E="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 61f105a62bd4..dc14049b9dbb 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -26,6 +27,19 @@ unwrapped = stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "fix-config-tests-on-darwin.patch"; + url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/48ad9d436cf80f58c107774c313a561d852148a0.diff"; + sha256 = "CEX1XkeYLUSe31xUhNdMRMl1VUXtKFCs5noNJaqL5x0="; + }) + (fetchpatch { + name = "fix-config-tests-on-aarch64-darwin.patch"; + url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/adaac913c50a5db2f226a081ddc419b0d56d1757.diff"; + sha256 = "1LrL74luzPTyJ7VBi7fskDga4lYAh7cSUmDcd1BNO78="; + }) + ]; + # Path fixups for the NixOS service. postPatch = '' patch meson.build < -Date: Tue, 19 Apr 2022 16:29:58 +0900 -Subject: [PATCH 1/8] Make gio-2.0 optional when gsettings is disabled - -Derived from https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d7e468cab..f7adf1413 100644 ---- a/meson.build -+++ b/meson.build -@@ -614,7 +614,7 @@ if dbus_dep.found() - cdata.set('HAVE_DBUS', 1) - endif - --gio_dep = dependency('gio-2.0', version : '>= 2.26.0') -+gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false) - if get_option('gsettings').enabled() - assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)') - cdata.set('HAVE_GSETTINGS', 1) --- -2.35.1 - diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ee2c0e0bd1c5..5084bd720514 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # but use a conventional runtime sysconfdir outside the store ./add-option-for-installation-sysconfdir.patch # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 - (./0001-Make-gio-2.0-optional-${lib.versions.major version}.patch) + ./0001-Make-gio-2.0-optional-16.patch # TODO (not sent upstream) ./0002-Ignore-SCM_CREDS-on-darwin.patch ./0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch @@ -147,20 +147,12 @@ stdenv.mkDerivation rec { '' # add .so symlinks for modules to be found under macOS + lib.optionalString stdenv.isDarwin '' - for file in $out/${passthru.pulseDir}/modules/*.dylib; do + for file in $out/lib/pulseaudio/modules/*.dylib; do ln -s "''$file" "''${file%.dylib}.so" ln -s "''$file" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so" done ''; - passthru = { - pulseDir = - if (lib.versionAtLeast version "16.0") then - "lib/pulseaudio" - else - "lib/pulse-" + lib.versions.majorMinor version; - }; - meta = { description = "Sound server for POSIX and Win32 systems"; homepage = "http://www.pulseaudio.org/"; diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix new file mode 100644 index 000000000000..60d20aa0ea55 --- /dev/null +++ b/pkgs/servers/search/qdrant/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, protobuf +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "qdrant"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "qdrant"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-rOIWiSpAqIUf2V9BMMTZqF/urz754pZV4yHav26dxqY="; + }; + + cargoSha256 = "sha256-ovHxtOYlzVsALw/4bhL9EcFXaKr6Bg/D0w6OPMCLZoQ="; + + nativeBuildInputs = [ protobuf rustPlatform.bindgenHook ]; + + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-faligned-allocation"; + + meta = with lib; { + description = "Vector Search Engine for the next generation of AI applications"; + longDescription = '' + Expects a config file at config/config.yaml with content similar to + https://github.com/qdrant/qdrant/blob/master/config/config.yaml + ''; + homepage = "https://github.com/qdrant/qdrant"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 7296635c7ddc..987e3770e982 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -21,8 +21,8 @@ perlPackages.buildPerlPackage rec { hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y="; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper perlPackages.perl perlPackages.AnyEvent perlPackages.ArchiveZip diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 686b839c6df8..f118c9ab80af 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -265,4 +265,9 @@ in { version = "10.8.4"; hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; }; + mariadb_109 = mariadbPackage { + # Supported until 2023-08(?) + version = "10.9.2"; + hash = "sha256-X0X/deBDlmVVqV+9uPCS5gzipsR7pZ0UTbRuE46SL0g="; + }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 364f574250bd..942ede627069 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -176,7 +176,7 @@ let postgresql.lib postgresql.man # in case user installs this into environment ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # We include /bin to ensure the $out/bin directory is created, which is diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index b3fe24bfb953..71533645ef0c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_hll"; - version = "2.16"; + version = "2.17"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-hll"; rev = "refs/tags/v${version}"; - sha256 = "0icns4m3dkm20fs6gznciwsb8ba8gcc316igz6j7qwjdnyg2ppbf"; + sha256 = "sha256-KYpyidy7t7v9puNjjmif16uz383zlo521luZpH3w/1I="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix new file mode 100644 index 000000000000..7e19ce2956a1 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_ivm"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "sraoss"; + repo = pname; + rev = "v${version}"; + hash = "sha256-q/iAMrT9npmtIKFKi/vSeYGvFSE+SgsKTP08YfBOpik="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; + homepage = "https://github.com/sraoss/pg_ivm"; + maintainers = with maintainers; [ ivan ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + broken = versionOlder postgresql.version "13"; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 3a0c1ea1f26e..ec236b4d9168 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.4.0"; + version = "2.5.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "1appxriw7h29kyhv3h6b338g5m2nz70q3mxasy4mjimqhbz1zyqs"; + sha256 = "sha256-BqOPnIReV6HnMQkqAGxB3PI10gh9ZEn4IN3A+g1h7/M="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 638941e9f71e..ecd0346f854f 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.3"; + version = "3.3.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-G02LXHVuWrpZ77wYM7Iu/k1lYneO7KVvpJf+susTZow="; + sha256 = "sha256-aWe3f3yKcjqHa+wmWPgqbLfytt3/sEgKsG0zcnivYFU="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 5bbede9ddfc4..59a06ac11d48 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -16,6 +16,8 @@ self: super: { pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; + pg_ivm = super.callPackage ./ext/pg_ivm.nix { }; + pg_rational = super.callPackage ./ext/pg_rational.nix { }; pg_repack = super.callPackage ./ext/pg_repack.nix { }; diff --git a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/pkgs/servers/web-apps/discourse/mail_receiver/default.nix index c1a3a2df1064..139e6718ed5e 100644 --- a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix +++ b/pkgs/servers/web-apps/discourse/mail_receiver/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0grifm5qyqazq63va3w26xjqnxwmfixhx0fx0zy7kd39378wwa6i"; }; - nativeBuildInputs = [ replace ]; - buildInputs = [ ruby makeWrapper ]; + nativeBuildInputs = [ replace makeWrapper ]; + buildInputs = [ ruby ]; dontBuild = true; diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index bbc41acf52e4..4d57de25a8f9 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.4.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-5ngX9VakQlcAVGDQ1R62oNfChGPjbu48ILFA3pBqP7k="; + hash = "sha256-J1cX8mm1yZTvsaz7DOAbmjmXkdoIrs793aDnmHm8BFk="; }; - vendorSha256 = "0rkn6lpy4n5ra1jy3m0ysdjpwh3hq2z4xwda2pzvp99sgszxl5g3"; + vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 773801eca17e..fb9f8e17b855 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yash"; - version = "2.52"; + version = "2.53"; src = fetchurl { url = "https://osdn.net/dl/yash/yash-${version}.tar.xz"; - hash = "sha256-VRN77/2DhIgFuM75DAxq9UB0SvzBA+Gw973z7xmRtck="; + hash = "sha256-5DDuhF39dxHE+GTVGN+H3Xi0BWAyfElPWczEcxWFMF0="; }; strictDeps = true; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3e11f7c6c418..85bd8d2087f6 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -149,21 +149,6 @@ rec { }); - # remove after 22.05 and before 22.11 - addCoverageInstrumentation = stdenv: - builtins.trace "'addCoverageInstrumentation' adapter is deprecated and will be removed before 22.11" - overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ]; - - - # remove after 22.05 and before 22.11 - replaceMaintainersField = stdenv: pkgs: maintainers: - builtins.trace "'replaceMaintainersField' adapter is deprecated and will be removed before 22.11" - stdenv.override (old: { - mkDerivationFromStdenv = overrideMkDerivationResult (pkg: - lib.recursiveUpdate pkg { meta.maintainers = maintainers; }); - }); - - /* Use the trace output to report all processed derivations with their license name. */ @@ -183,35 +168,6 @@ rec { }); - # remove after 22.05 and before 22.11 - validateLicenses = licensePred: stdenv: - builtins.trace "'validateLicenses' adapter is deprecated and will be removed before 22.11" - stdenv.override (old: { - mkDerivationFromStdenv = overrideMkDerivationResult (pkg: - let - drv = builtins.unsafeDiscardStringContext pkg.drvPath; - license = - pkg.meta.license or - # Fixed-output derivations such as source tarballs usually - # don't have licensing information, but that's OK. - (pkg.outputHash or - (builtins.trace - "warning: ${drv} lacks licensing information" null)); - - validate = arg: - if licensePred license then arg - else abort '' - while building ${drv}: - license `${builtins.toString license}' does not pass the predicate. - ''; - - in pkg // { - outPath = validate pkg.outPath; - drvPath = validate pkg.drvPath; - }); - }); - - /* Modify a stdenv so that it produces debug builds; that is, binaries have debug info, and compiler optimisations are disabled. */ diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/tools/X11/xkb-switch-i3/default.nix index fcb71b5d6d1f..6333c1abc740 100644 --- a/pkgs/tools/X11/xkb-switch-i3/default.nix +++ b/pkgs/tools/X11/xkb-switch-i3/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "xkb-switch-i3"; - version = "1.8.1"; + version = "1.8.5"; src = fetchFromGitHub { owner = "Zebradil"; repo = "xkb-switch-i3"; rev = version; - sha256 = "15c19hp0n1k3w15qn97j6wp5b8hbk0mq6x3xjfn6dkkjfz1fl6cn"; + sha256 = "sha256-oW1oXxYqaLTnVQMBEOFPdzS8EnpoPc68kbGxGXaWUB8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 841e63cae4ca..30c16e4676d8 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "1wjj14gx2phpbxs1433k3jkkc0isx5mzbm62rpvxbfd8a7f6n1l5"; + sha256 = "sha256-vRzap9JiV6HzQJKVAByLPMCqADMufoool8Nuw2xu2L4="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 9b6bf65de550..d1790d73ebed 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -3,13 +3,13 @@ GEM specs: CFPropertyList (3.0.5) rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.617.0) - aws-sdk-core (3.132.0) + aws-partitions (1.622.0) + aws-sdk-core (3.136.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -37,7 +37,7 @@ GEM dotenv (2.8.1) emoji_regex (3.2.3) excon (0.92.4) - faraday (1.10.1) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.209.0) + fastlane (2.209.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -150,7 +150,7 @@ GEM httpclient (2.8.3) jmespath (1.6.1) json (2.6.2) - jwt (2.4.1) + jwt (2.5.0) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) @@ -161,7 +161,7 @@ GEM optparse (0.1.1) os (1.1.4) plist (3.6.0) - public_suffix (4.0.7) + public_suffix (5.0.0) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 88659c24c710..5689274270e6 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; artifactory = { groups = ["default"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01fd3g1iic8agjbnynrqdvh95csvy1qf2x6v8zla5m2sx5xq3k88"; + sha256 = "1py4q91ll3v7ylcqflgd190y40d3ixgrhpln011gr5adgbzg9hr6"; type = "gem"; }; - version = "1.617.0"; + version = "1.622.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lal5x2qkz6ip36ladynb29j65brq8bbdcgx6cwbybsyadwcf693"; + sha256 = "111zdfl6p1n949rvsfr0c88k9yzpibrcd8fihyshbibc2w06qj2b"; type = "gem"; }; - version = "3.132.0"; + version = "3.136.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; + sha256 = "1d5ipsv069dhgv9zhxgj8pz4j52yhgvfm01aq881yz7qgjd7ilxp"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1119ahlcc26s6ii12sjv26fnrcdnw6srl17wa82ynqsgya5gyxrd"; + sha256 = "17m4nrpsjx2kadgy3qasis9d8rzajxgi9gzwkvdj7c0jjs6a768d"; type = "gem"; }; - version = "2.209.0"; + version = "2.209.1"; }; gh_inspector = { groups = ["default"]; @@ -548,10 +548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; memoist = { groups = ["default"]; @@ -658,10 +658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; rake = { groups = ["default"]; diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index b298078aae35..39cffeaf2020 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "netplan"; - version = "0.103"; + version = "0.105"; src = fetchFromGitHub { owner = "canonical"; repo = "netplan"; rev = version; - hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; + hash = "sha256-77vUZU9JG9Dz/5n4DpcAUS77UqfIILXhZHgBogIb400="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace netplan/cli/utils.py \ + substituteInPlace netplan/libnetplan.py \ --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \ --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" diff --git a/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/pkgs/tools/admin/puppet/puppet-bolt/default.nix index 7752ddb2808d..cf6ffb6fb893 100644 --- a/pkgs/tools/admin/puppet/puppet-bolt/default.nix +++ b/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "bolt" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; gemConfig.bolt = attrs: { # scripts in libexec will be executed by remote host, diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix new file mode 100644 index 000000000000..461a9123c59c --- /dev/null +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "qovery-cli"; + version = "0.45.0"; + + src = fetchFromGitHub { + owner = "Qovery"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cJb5Cac7WDhtNL/7uIIvAz7Kum3Ff2g6tmKyTJWvq00="; + }; + + vendorSha256 = "sha256-KHLknBymDAwr7OxS2Ysx6WU5KQ9kmw0bE2Hlp3CBW0c="; + + meta = with lib; { + description = "Qovery Command Line Interface"; + homepage = "https://github.com/Qovery/qovery-cli"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0bc554d96fa9..34c79fed60a1 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.51.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ISmUCu+SiY2hCf6MoIBolstMIgl5g/kGpmBuOVLoybY="; + sha256 = "sha256-TSWP9VT5D9J9a7WkAdxXxlbVthbkQxZAAPzuc3Q8joc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-d31LHkxSyO0QwA5FXX2Zfzj0ctat/Lqb5yObTrauJUg="; + vendorSha256 = "sha256-4exKUrhESpfrFr9jGqSMPQZP644HU7gjh1kOVXUhO7Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 7df594d88ece..fb9ef49c548e 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - makeWrapper alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme + alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index e36e20902df8..00a03cda7149 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "lvmsync"; version = (import ./gemset.nix).${pname}.version; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 3b0a990b52cc..26fb1dad879e 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wal-g"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "sha256-xltKchk7RtP5tkoUhnJqVb17WW6qW/lSFdHivCbW5zY="; + sha256 = "sha256-5mwA55aAHwEFabGZ6c3pi8NLcYofvoe4bb/cFj7NWok="; }; - vendorSha256 = "sha256-w9AVcld8Gd1kYE2PkN8RVZ+/xlOZChKoWZFKvqhJuWI="; + vendorSha256 = "sha256-BbQuY6r30AkxlCZjY8JizaOrqEBdv7rIQet9KQwYB/g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 6164a39ac76f..e10c82d7201a 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "sha256-bohc/0hUr1mcV2JbFy71TjY8MXOU3oBBPCcupgkWsWY="; + sha256 = "sha256-Dp3O41nzo7j5rqxDEkR4bFPv0CNGOO4kWXAf8iy+jDg="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index dfe42f7666bf..09c1f4475420 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.18.1"; + version = "5.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-bpinXM/1LpNU2qGtKExhTEkPhEJzovpSTLrJ64QcclU="; + sha256 = "sha256-H7zwbksvgOehJ/1oftRiWlt0+mdP4hLINv9w4O38zPk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 125fb01d88a1..a1d09df7e609 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -14,9 +14,9 @@ let # can help with finding new Python scripts. buildInputs = [ - fuse bison flex openssl ncurses readline - libtool pkg-config zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools + fuse openssl ncurses readline + zlib libaio libxml2 + acl sqlite liburcu attr util-linux libtirpc gperftools liburing (python3.withPackages (pkgs: [ pkgs.flask @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" ]; - nativeBuildInputs = [ rpcsvc-proto autoconf automake ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config bison flex makeWrapper rpcsvc-proto ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index a0c598c1f2bf..249444ae0d64 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qERtX9UcdMolbffzPiVQlblirzJ5baOmHonJIO8ang0="; + sha256 = "sha256-IJUmH9w6ItDAZNbiO1Kkq3NO2c4Qpcd0ELiPlIPpbNI="; }; - vendorSha256 = "sha256-yJ7RYwhArgmGlFmSplrX1hiLkc7FkS1qQCUcRlbnNWQ="; + vendorSha256 = "sha256-7PpMnkoTMW4rb2Gy6s3CN7K3wG+QHmyvN3+7TYru2hE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index b12da3eade3d..6712b96f7fdd 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { name = "kdiskmark"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "jonmagon"; repo = "kdiskmark"; rev = version; - sha256 = "sha256-9ufRxEbqwcRs+m/YW8D3+1USCJNZEaOUZRec7gvgmtA="; + sha256 = "sha256-fDimH0BX0zxGuOMNLhNbMGMr2pS+qbZhflSpoLFK+Ng="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 9a221dcfc2f6..24ae9154a68d 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.33.3"; + version = "2.33.5"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-hZA7AkFEuSHp84Zn+m9+VVr4UewbbzeQL1n2bkUOX0Y="; + sha256 = "sha256-Hj124GzJV5WNGJHvgelem5B/Ru+F/ILzsX2X8gs7Jww="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix index dc6d3a09bfa4..7ed5bc99f46b 100644 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ b/pkgs/tools/inputmethods/fusuma/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "fusuma" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram "$out/bin/fusuma" \ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 9712b56b01e1..aa45805806e5 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.16.7"; + version = "1.16.11"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-rejYxuRhzNmtx11NH3BZe3ODjU5OyZ9sgk6GWnBBXAo="; + sha256 = "sha256-lojHn6esoE5MLyPZ/U70+6o0X2D8EH+R69dgQo+59t4="; }; postPatch = '' diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/tools/misc/changelogger/default.nix index 16968650d3eb..c659aa543595 100644 --- a/pkgs/tools/misc/changelogger/default.nix +++ b/pkgs/tools/misc/changelogger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changelogger"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r/rnYutjETlE05A/kVQEQ6ICtWXW6kMMfPrv1rw5f3Q="; + sha256 = "sha256-AP5cuXAuh5LX6FTsku38Zh1Y4SVaa4l5XEBTMZnYr6g="; }; vendorSha256 = "sha256-RmLSuLZdYpA557xN7fkPZm5ektxvRHil1E2u1qR7EO0="; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index fef8750085ef..1cd86ddf9c28 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-02YPLWuwMBvjIrkkZWlOmoASJ0El0YcQhVnt8wfpMaY="; + sha256 = "sha256-93f01YfCold2lUoCjnmIpwUR2pDvJ8Ph+QKEvZLL02Y="; }; - vendorSha256 = "sha256-CJZiItzpk5vQBeKvarfHFsW2ek2yn7z6+CAlDPXdNyI="; + vendorSha256 = "sha256-jFXK/VvOyL9JUrMkzAZA++ydPKH0iL+4oH2YD1uh9CQ="; doCheck = false; diff --git a/pkgs/tools/misc/conserver/default.nix b/pkgs/tools/misc/conserver/default.nix new file mode 100644 index 000000000000..d8bb437404d4 --- /dev/null +++ b/pkgs/tools/misc/conserver/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, gssapiSupport ? false +, libkrb5 +, freeipmiSupport ? false +, freeipmi +, ipv6Support ? true +, opensslSupport ? true +, openssl +, trustUdsCredSupport ? false +, udsSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "conserver"; + version = "8.2.7"; + + src = fetchFromGitHub { + owner = "bstansell"; + repo = "conserver"; + rev = "v${version}"; + sha256 = "sha256-LiCknqitBoa8E8rNMVgp1004CwkW8G4O5XGKe4NfZI8="; + }; + + # Remove upon next release since upstream is fixed + # https://github.com/bstansell/conserver/pull/82 + patches = [ + (fetchpatch { + url = "https://github.com/bstansell/conserver/commit/84fc79a459e00dbc87b8cfc943c5045bfcc7aeeb.patch"; + sha256 = "sha256:1dy8r9z7rv8512fl0rk5gi1vl02hnh7x0i6flvpcc13h6r6fhxyc"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ ] + ++ lib.optionals freeipmiSupport [ freeipmi ] + ++ lib.optionals gssapiSupport [ libkrb5 ] + ++ lib.optionals opensslSupport [ openssl ]; + + configureFlags = [ "--with-ccffile=/dev/null" "--with-cffile=/dev/null" ] + ++ lib.optionals freeipmiSupport [ "--with-freeipmi=${freeipmi}/include" ] + ++ lib.optionals gssapiSupport [ "--with-gssapi=${libkrb5.dev}/include" ] + ++ lib.optionals ipv6Support [ "--with-ipv6" ] + ++ lib.optionals opensslSupport [ "--with-openssl=${openssl.dev}/include" ] + ++ lib.optionals trustUdsCredSupport [ "--with-trust-uds-cred" ] + ++ lib.optionals udsSupport [ "--with-uds" ]; + + # Disabled due to exist upstream cases failing 8/15 tests + doCheck = false; + + meta = with lib; { + homepage = "https://www.conserver.com/"; + description = "An application that allows multiple users to watch a serial console at the same time"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sarcasticadmin ]; + }; +} diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 6aa22a7f64f0..e1e370a11c23 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; - rev = version; - hash = "sha256-jwJw56Z/Y0vnsybE/FfXXHtz0W0J80Q5rrRRoINbjkM="; + rev = "v${version}"; + hash = "sha256-aFSal+MDJ7W50ZMgBkkyLaJjJoNeSGubylaRK0tbAzY="; }; - vendorSha256 = "sha256-7KQDaDM151OFfTYRPOit4MAmwgEzvLOYFWCjXhVmFT0="; + vendorSha256 = "sha256-RW6DdMQeuKVP4rFN13Azq+zAx6dVXmdnIA6aDMCygcI="; ldflags = [ "-X" "main.Version=${version}" ]; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 0f8aecc5b1d7..9acede0e11bc 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SmYRhOxyptY/DVc+JRT9Yn52WRHOS0B5tfmrqp05hxE="; + sha256 = "sha256-wU6iPOQA9rWchj4pOGos0r5QwTAWC9eoYWSRK8W1Gt0="; }; - cargoSha256 = "sha256-chiKNVZg6sUN9s1fhWCk64UOsw0nXkrjopfkAFbZbwI="; + cargoSha256 = "sha256-qVnFhES3On0qe0vdii2RMhJu7z6E0udFRD6xQy2+hbk="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index ef51ad980325..30b7f79f04ac 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdupes"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - hash = "sha256-WtSuFWRqQo5D/FLwl3AaIIfg6q+09A3aP5//J4AUzus="; + hash = "sha256-w1vIZexuXoCpc509QKdKnUaD4Obs5rsjptYAE4T/T+g="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index de2b166f47e2..3e61b15414f9 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.12.1"; + version = "5.12.2"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw="; + hash = "sha256-XVswjIXnuWLRiXFc38lDhSvxYTQtYjs4V/AGdiNLX0g="; }; udevRules = fetchurl { diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 3a49a9309e61..977489632023 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-ARwBm9p6o/iC09F6pc5c4qq3WClNTyAvLPsG58YQOAM="; + sha256 = "sha256-8R4QSCTSLjR0LZ6HpioeBm4xyhNoHfis60G4ZHfWS0o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix index 79c590fe6b30..2d1c127dc8ab 100644 --- a/pkgs/tools/misc/gwe/default.nix +++ b/pkgs/tools/misc/gwe/default.nix @@ -32,13 +32,13 @@ let ]); in stdenv.mkDerivation rec { pname = "gwe"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitLab { owner = "leinardi"; repo = pname; rev = version; - sha256 = "sha256-7TVy9k61YA8tDXR2PC7TzwxKykWjnw8hQzgTQQIC0Zg="; + sha256 = "sha256-bey/G+muDZsMMU3lVdNS6E/BnAJr29zLPE0MMT4sh1c="; }; prePatch = '' diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 03efc1b664c5..c495e3455a29 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -3,6 +3,7 @@ , syslinux ? null , embedScript ? null , additionalTargets ? {} +, additionalOptions ? [] }: let @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { "IMAGE_TRUST_CMD" "DOWNLOAD_PROTO_HTTP" "DOWNLOAD_PROTO_HTTPS" - ]; + ] ++ additionalOptions; configurePhase = '' runHook preConfigure diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 5f0c41cbd400..21dd287f56ad 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -28,6 +28,7 @@ python3.pkgs.buildPythonPackage rec { nativeBuildInputs = [ glib + gobject-introspection pkg-config wrapGAppsHook ]; @@ -37,7 +38,6 @@ python3.pkgs.buildPythonPackage rec { dconf gnome.nautilus gnome.nautilus-python - gobject-introspection gsettings-desktop-schemas gtk3 python3.pkgs.pygobject3 diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/tools/misc/notify/default.nix index 8210dac327e6..9f84a7a867dc 100644 --- a/pkgs/tools/misc/notify/default.nix +++ b/pkgs/tools/misc/notify/default.nix @@ -1,20 +1,21 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "notify"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-grTHSMN4PpsCo5mST6nXE5+u7DewMVJXI3hnNIJdhLs="; + sha256 = "sha256-VRMwyVaTUJ+dDqewDGNZR1jH2EmDq1b42he7andh+/Q="; }; - vendorSha256 = "sha256-BbhDNy3FmnHzAfv3lxPwL2jhp8Opfo0WVFhncfTO/28="; + vendorSha256 = "sha256-JsEKtE3N7C+BA3SanYwX17uJcFmbzPMWl5tUYPLCRdQ="; modRoot = "."; subPackages = [ @@ -24,6 +25,10 @@ buildGoModule rec { # Test files are not part of the release tarball doCheck = false; + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + }; + meta = with lib; { description = "Notify allows sending the output from any tool to Slack, Discord and Telegram"; longDescription = '' diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index fe506a31c0ef..abba7ca91ac3 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.5.4"; + version = "5.5.6"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-2j1K9enoPBPLL+0oOhzcYVxfsjb8BzsfeHNi9TJOnmc="; + sha256 = "sha256-99EuWSNW9e5/GyiR3JwDNFTAOJpaGCJKmxt340bjPrA="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 26a80c6a6591..07dafb37ccc6 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.38.0"; + version = "1.53.4"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-nlv0NOvUi/yf2lQytdfRE7YwcSpRHQRlI0zzeKAA760="; + sha256 = "sha256-R5LlRjRSV+Mm5Ga3yN51ch4V0YykSiSAGVaO8AKEL6M="; }; - vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y="; + vendorSha256 = "sha256-8QMrfCq5oAS+fjUccBeGrEGU5y4vtZr2o2HhpDk90K0="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 7f453892934b..abfc85766298 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: +{ lib, stdenv, fetchurl +, gtk3 +, wrapGAppsHook +, pkg-config }: stdenv.mkDerivation rec { pname = "xdaliclock"; - version = "2.44"; + version = "2.45"; src = fetchurl { - url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; - sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0"; + url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; + hash = "sha256-GHjSUuRHCAVwWcDMRb2ng1aNbheu+xnUBNLqSpPkZeQ="; }; # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook # on aarch64 doesn't find the files to patch and the aarch64 build fails! preConfigure = "cd X11"; - buildInputs = [ libX11 xorgproto libXt libICE libSM libXext ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + buildInputs = [ + gtk3 + ]; preInstall = '' - mkdir -vp $out/bin $out/share/man/man1 + mkdir -vp $out/bin $out/share/man/man1 $out/share/gsettings-schemas/$name/glib-2.0/schemas $out/share/pixmaps $out/share/applications + + # https://www.jwz.org/blog/2022/08/dali-clock-2-45-released/#comment-236762 + gappsWrapperArgs+=(--set MESA_GL_VERSION_OVERRIDE 3.1) ''; + installFlags = [ + "GTK_ICONDIR=${placeholder "out"}/share/pixmaps/" + "GTK_APPDIR=${placeholder "out"}/share/applications/" + ]; + meta = with lib; { description = "A clock application that morphs digits when they are changed"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 4e84b858538c..d2defe954464 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rQNrxAKf2huY9I6iqdf1iYxgXaQI0LG1Lkrnv1OuJsg="; + sha256 = "sha256-JWuVoEEViVHn39LmJ0IQGg6ggDKS49WhE5Qwp+ep0Pk="; }; - vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M="; + vendorSha256 = "sha256-caFYa0chTsIVW7pN/TBJNfQpnF6Hm4/GFyULDqL/bH4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/tools/networking/chaos/default.nix index 1b88625e6925..229d3af208ef 100644 --- a/pkgs/tools/networking/chaos/default.nix +++ b/pkgs/tools/networking/chaos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chaos"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "chaos-client"; rev = "v${version}"; - sha256 = "sha256-uND88KGlUxGH3lGlcNdjSRsti/7FofruFJIcftdgzcE="; + sha256 = "sha256-1bmKIBbsZHNzwFZ0iPshXclCTcQMzU7zRs5MjMhTFYU="; }; - vendorSha256 = "sha256-pzh/t8GeJXLIydSGoQ3vOzZ6xdHov6kdYgu2lKh/BNo="; + vendorSha256 = "sha256-2QOdqX4JX9A/i1+qqemVq47PQfqDnxkj0EQMzK8k8/E="; subPackages = [ "cmd/chaos/" diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 7120e76821d6..b6b7c2ba9e31 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -29,7 +29,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.8.2"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ="; + sha256 = "sha256-iBeiTCPxMJud4jO5qIJFX0V8Qu3CpknccP4lJM922Uw="; }; preConfigure = '' diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index 57ab6ed97b90..6feaec38f70a 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -49,10 +49,8 @@ in stdenv.mkDerivation rec { patches = [ ./40103-iostat-fix.patch ]; - nativeBuildInputs = [ unzip ]; - buildInputs = [ - makeWrapper - ] ++ (with python'.pkgs; [ + nativeBuildInputs = [ unzip makeWrapper ]; + buildInputs = with python'.pkgs; [ requests psycopg2 psutil @@ -63,7 +61,7 @@ in stdenv.mkDerivation rec { python-etcd consul docker - ]); + ]; propagatedBuildInputs = with python'.pkgs; [ python tornado ]; buildCommand = '' diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 068baff54d83..cf3306ccfb94 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-2vjOxbfCBNBNlEUOXmmWEJYxM2aeEi3yIbJ1XsFmNNw="; + sha256 = "sha256-Mqfbug+v47RdFEN13hTFxu/JYINz5fFE2QKzZs3FoJU="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index ddf3e5436886..6afe1a241a07 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,22 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-P21rANxgreXu8vA1vsFCSkh1Irs67r3s33XT1dMFD7I="; + sha256 = "sha256-dk9OXUt31UIZLH3E50R8iE8zJqvdT1pBu1oU25QrOro="; }; - cargoSha256 = "sha256-l6xQbZVrWF8Uw27datqvv9B3LoPtoaCnumo0gIjKdaA="; + cargoSha256 = "sha256-WlAAuFz7DZ4PhlTgEXNK9sZKkS95pCrbX2AXC3c1rh8="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optional stdenv.isLinux openssl ++ lib.optional stdenv.isDarwin Security; + # remove cargo config so it can find the linker + postPatch = '' + rm .cargo/config.toml + ''; + # tests don't work inside the sandbox doCheck = false; diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/tools/networking/pritunl-ssh/default.nix index 586fc780699f..06cfc4d1a4ce 100644 --- a/pkgs/tools/networking/pritunl-ssh/default.nix +++ b/pkgs/tools/networking/pritunl-ssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pritunl-ssh"; - version = "1.0.1674.4"; + version = "1.0.2435.24"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-zero-client"; rev = version; - sha256 = "07z60lipbwm0p7s2bxcij21jid8w4nyh6xk2qq5qdm4acq4k1i88"; + sha256 = "sha256-ElnBNVrC4tQLYXhz2d+NMqKdUVx/hgnW3xJ0USKEfVI="; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 4b4e6cedc5cd..d1f0d2e97391 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, go-rice }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "cfssl"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-QY04MecjQTmrkPkWcLkXJWErtaw7esb6GnPIKGTJL34="; + sha256 = "sha256-cyriV6z904QlkDlP80CSpakISJn7S81/2fcspAf5uk4="; }; subPackages = [ @@ -26,19 +26,13 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ go-rice ]; - - preBuild = '' - pushd cli/serve - rice embed-go - popd - ''; - ldflags = [ "-s" "-w" "-X github.com/cloudflare/cfssl/cli/version.version=v${version}" ]; + passthru.tests = { inherit (nixosTests) cfssl; }; + meta = with lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 3c67c4aa7800..1747417e1162 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ prusnak mmahut ]; platforms = platforms.linux; + broken = true; # 2022-08-28 }; } diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index a382eecce3fe..2cc8917450f4 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.1.4"; - versiondate = "20220519"; + version = "10.1.5"; + versiondate = "20220726"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "sha256-cOrmM+uE2ajGaYg9CmDHT3/hje7K9cmsq6u9MjkCHWk="; + sha256 = "sha256-HjsbOTI+mHSmgFREGuUXKT7gbSSk2Gw/sLzP6eAkUX8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 5a0d90218f3e..6dfed076d2ef 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.11.0"; + version = "8.11.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6zuxEEJlSppR6yBWNKjfNOndICWMnAHaO4mOI9pP7aQ="; + sha256 = "sha256-E6ogPJQbg8hrfUNPIQ7b9c5at5VY73j0cEolzQpzUTM="; }; vendorSha256 = "sha256-KtBE8zOCSh/sItEpEA+I2cG3U44FJ2wxxVX3F6choUY="; diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/tools/security/gitsign/default.nix index 00a8a3a4735d..129f3790da42 100644 --- a/pkgs/tools/security/gitsign/default.nix +++ b/pkgs/tools/security/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.1.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0cu5uJVFiqkvfVxCbrruHLa4Zj0EU75cbgrTrwzo7+U="; + sha256 = "sha256-ldVBaKBa9Rq15OXb0nAqY70RH5Ww9DRNmKZ5spuBOzc="; }; - vendorSha256 = "sha256-JMS/OFL2oxQFWa+wNhxS7fXSYQbCSEV3Sakq4rmsolI="; + vendorSha256 = "sha256-hE+P6dS/tC+y9Pf5IGy23a5j7VSDvedzcNTkLK4soiA="; ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix new file mode 100644 index 000000000000..0b8447e6e488 --- /dev/null +++ b/pkgs/tools/security/jwx/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "jwx"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "lestrrat-go"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7X+UeguaWk7+IQ2/PgoFZR7OKpOTzgT/mo8k4eSl53A="; + }; + + vendorSha256 = "sha256-XZk/cwbfg05RkUFMs+AHTfEZiEvqYYoPoSVZVFM967g="; + + sourceRoot = "source/cmd/jwx"; + + meta = with lib; { + description = " Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies"; + homepage = "https://github.com/lestrrat-go/jwx"; + license = licenses.mit; + maintainers = with maintainers; [ arianvp flokli ]; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3df96f282baf..db5ca84f656a 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.13" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.14" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d6a3bb6991fa..025ff1ca42dc 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 6241267e515db4b2902831fda1bc41773fb24529 - ref: refs/tags/6.2.13 + revision: 349b7d4bf192254eac191cc2603f9553a8d6da1b + ref: refs/tags/6.2.14 specs: - metasploit-framework (6.2.13) + metasploit-framework (6.2.14) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -44,7 +44,7 @@ GIT network_interface nexpose nokogiri - octokit + octokit (~> 4.0) openssl-ccm openvas-omp packetfu @@ -124,22 +124,22 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.619.0) - aws-sdk-core (3.132.0) + aws-partitions (1.622.0) + aws-sdk-core (3.136.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.328.0) + aws-sdk-ec2 (1.329.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.69.0) + aws-sdk-iam (1.70.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.58.0) @@ -254,7 +254,7 @@ GEM mini_portile2 (2.8.0) minitest (5.16.3) mqtt (0.5.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) @@ -274,7 +274,7 @@ GEM mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) - octokit (5.2.0) + octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) openssl-ccm (1.2.3) @@ -291,8 +291,8 @@ GEM ruby-rc4 ttfunk pg (1.4.3) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) racc (1.6.0) rack (2.2.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 2cc25a9728e3..0c447147e9b9 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.13"; + version = "6.2.14"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-95G9iqejcc2t4pUmzNoDE9/9f6NstPjLDJigQhZAo4E="; + sha256 = "sha256-eWM5gAnF3WepXsf2bSfjwr4Tsz4nnuZVllNWj7ko5cM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e962b2571420..6d4323ccba0e 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; afm = { groups = ["default"]; @@ -104,40 +104,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgbfpxpybq5hr87knpc65ha0cyckbq2i00y8wd8sc3j663sffm2"; + sha256 = "1py4q91ll3v7ylcqflgd190y40d3ixgrhpln011gr5adgbzg9hr6"; type = "gem"; }; - version = "1.619.0"; + version = "1.622.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lal5x2qkz6ip36ladynb29j65brq8bbdcgx6cwbybsyadwcf693"; + sha256 = "111zdfl6p1n949rvsfr0c88k9yzpibrcd8fihyshbibc2w06qj2b"; type = "gem"; }; - version = "3.132.0"; + version = "3.136.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x9wcq89bp8785qqx8jlj4isbqq5w5kisfdd275r6p2chmm1mw47"; + sha256 = "1ici0pvy5050flp8v8rcd71cn09waa9wb42jpc93nn8qns5yhs44"; type = "gem"; }; - version = "1.328.0"; + version = "1.329.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rms5bbqsgy7wb13y0chm1mw9qasdrbmd5bpdwlkn0ib58s174d6"; + sha256 = "1xb1wdjdy91ybf0zrnny3kw7s076mcvhamikn1v5n6mgaypnkzw3"; type = "gem"; }; - version = "1.69.0"; + version = "1.70.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "6241267e515db4b2902831fda1bc41773fb24529"; - sha256 = "10d380b4584q1k5zid3cldzzvpqk0gdcq9lmwanwswd3ly5bv4gp"; + rev = "349b7d4bf192254eac191cc2603f9553a8d6da1b"; + sha256 = "1hz552wqymjkjrayd7i77sri7gn2wcknvxn7bslngpf51603jqvr"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.13"; + version = "6.2.14"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; multi_json = { groups = ["default"]; @@ -837,10 +837,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xn53wdrk0vy08d88s6dd2n3mly3prw8m00pcc9hm7ykmbs1668r"; + sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860"; type = "gem"; }; - version = "5.2.0"; + version = "4.25.1"; }; openssl-ccm = { groups = ["default"]; @@ -927,20 +927,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; + sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.5"; }; racc = { groups = ["default"]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index f441772dbc17..e60c953fd5a5 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.6"; + version = "2.7.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KFTVXHATWeKL+fvB52IekT9WMa61Aca0bDJ7g1n1kfU="; + sha256 = "sha256-61oq7h/e9aFCEwvrKRx1zyITw/X2obRsnyycO94tW0A="; }; - vendorSha256 = "sha256-hzKGqX0YPo4lhp0RTmeQlhUsvG2XhZxkl/TtI9YjEoY="; + vendorSha256 = "sha256-HZZutN6hG/wNBz1hy0S3kWd/LmaeAvn1NlB917xmCDo="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 7d214f1649a3..f8692edead29 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -33,7 +33,8 @@ let in buildEnv { name = "pass-extensions-env"; paths = selected; - buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = concatMap (x: x.buildInputs) selected; postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/tools/security/sbctl/default.nix new file mode 100644 index 000000000000..00a5f53d6b50 --- /dev/null +++ b/pkgs/tools/security/sbctl/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, asciidoc +, databasePath ? "/etc/secureboot" +}: + +buildGoModule rec { + pname = "sbctl"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "Foxboron"; + repo = pname; + rev = version; + hash = "sha256-mntb3EMB+QTnFU476Dq6T6rAAv0JeYbvWJ/pbL3a4RE="; + }; + + vendorSha256 = "sha256-k6AIYigjxbitH0hH+vwRt2urhNYTToIF0eSsIWbzslI="; + + ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; + + nativeBuildInputs = [ installShellFiles asciidoc ]; + + postBuild = '' + make docs/sbctl.8 + ''; + + postInstall = '' + installManPage docs/sbctl.8 + + installShellCompletion --cmd sbctl \ + --bash <($out/bin/sbctl completion bash) \ + --fish <($out/bin/sbctl completion fish) \ + --zsh <($out/bin/sbctl completion zsh) + ''; + + meta = with lib; { + description = "Secure Boot key manager"; + homepage = "https://github.com/Foxboron/sbctl"; + license = licenses.mit; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index a4caf7511281..4ed783626520 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.3.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+aocaMnEDqaOjiCPmAxhf1tiqMN6DKo64N0ARMmY71E="; + sha256 = "sha256-mEUJ42Da9br5BuZgtJBMeJGSESALoqaOwO/4Bvqj0IA="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-0VEo08lGVQ3ROdqFrpNVgdtfaKqNY4hhjZ0i3U52P4M="; + vendorSha256 = "sha256-HvYUfr3ojmhO6AY6SypFOMP/vjlyLKunv1LvfLgBSjU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index d5b0eda8088f..7430ea3da42e 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-8A63RaNa6/CD0Jlckid3RFvf0gpibFW5YZ36MdYI4ak="; + sha256 = "sha256-X99/Fnow6l47T9ZAhEjRNOsVWO48utuCr3jW9Emb0T4="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-o11PoBKC0SDPgPjqAr4KA2SAS6vusRBqzNUwnhZ9hxA="; + vendorSha256 = "sha256-USDr/16cPR7PjWnXpQvi+4sKRyyFw+1EdCDE7vWs7LQ="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/tools/security/waf-tester/default.nix index 3ef1dbb47e19..427bb1db2c31 100644 --- a/pkgs/tools/security/waf-tester/default.nix +++ b/pkgs/tools/security/waf-tester/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "waf-tester"; - version = "0.6.10"; + version = "0.6.12"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - hash = "sha256-fl0gcpcJr7yckfNcnt1C+i2iGdD2oiCq7gJIkiz2v7E="; + hash = "sha256-baj9JuC4PF5c50K2aY+xwdE9t4aTzOu+isqJ6r1pWuc="; }; vendorSha256 = "sha256-qVzgZX4HVXZ3qgYAu3a46vcGl4Pk2D1Zx/giEmPEG88="; diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 965c48b304fe..4b3757ae7673 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -9,9 +9,7 @@ bundlerApp { gemdir = ./.; exes = [ "wpscan" ]; - buildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram "$out/bin/wpscan" \ diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 43d67eddf7db..12522bd8cff1 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "r10k" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 10ec02369dc8..d7bc0a2cb829 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -18,7 +18,7 @@ let sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; name = "smartmontools-drivedb.h"; }; - scriptPath = lib.makeBinPath ([ gnused ] ++ lib.optional enableMail [ inetutils mailutils ]); + scriptPath = lib.makeBinPath ([ gnused ] ++ lib.optionals enableMail [ inetutils mailutils ]); in stdenv.mkDerivation rec { diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 4493066a6241..7cbbdfc0c36c 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-7Y51S4PM+HpiPCG3ju7Aagw1XoPM3DpckGtVhH7Od8Q="; + sha256 = "sha256-HooO8T1FLIuERlI2dWGWMtPbtjVB9MPuA1IB+9CYytw="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-36HZ/5rx5K3mVNyBtDzJnSrKRGShFd1aEt3qqPsNqfs="; + cargoSha256 = "sha256-5HwipbtQ/zW61fgam1BGnEJYVzA98TH7y3eZ8bES2Ck="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index bce8fec2da48..da48d81dfb23 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.7"; + version = "5.8"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-UR8OodT2H+YKmal+9kYsiwqM0dZhUHaUGEWZMzT+3dA="; + sha256 = "sha256-xwwC+I4cThl2iq3eKcjInFciWlhBfQvNA5LBalaXBuQ="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index aea58ddb9364..c471bbe4d05a 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miller"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-5lDoJo5v6L4nkaCSyeViOeCN6cn4lBIwHYc0Jx70FFk="; + sha256 = "sha256-nxkJfbZ5zdAKtmhZiWhTV0cU+qvqimOADC9T0r+1iS0="; }; - vendorSha256 = "sha256-MUffv6dRvtc4pC1vErGgUMh6B8bbVaP0avAKNamRErI="; + vendorSha256 = "sha256-EF5hTtTGGOYg9TGIsR3UL2Sxc3FHGV2q5VNXlBNma/M="; subPackages = [ "cmd/mlr" ]; diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix index e31ce69baa1f..50ee906262ee 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix @@ -20,7 +20,7 @@ bundlerApp rec { "asciidoctor-revealjs" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = lib.optionalString (path != "") (lib.concatMapStrings (exe: '' wrapProgram $out/bin/${exe} \ diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index aa1d68e708af..ebe57e3695f5 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -13,7 +13,7 @@ let "kramdoc" ]; - # buildInputs = [ makeWrapper ]; + # nativeBuildInputs = [ makeWrapper ]; # postBuild = '' # wrapProgram "$out/bin/asciidoctor-epub3" \ diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 85f4bfad1187..594757b2c5a6 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmark"; - version = "2.2.25"; + version = "2.2.26"; src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; rev = "v${version}"; - sha256 = "sha256-9XjNTbsB4kh7YpjUnTzSXypw9r4ZyR7GALTrYebRKAg="; + sha256 = "sha256-DiT2MkVM2DWp8dVr8I3Qt6iymHJPW3VEIaX+ACrDVo8="; }; - vendorSha256 = "sha256-uHphMy9OVnLD6IBqfMTyRlDyyTabzZC4Vn0628P+0F4="; + vendorSha256 = "sha256-vhSrHh1wmIK3H5p5Q5QznSVainkZByrW+Nz81J9Va88="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index a4110d5187e0..8ea825567a69 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -5,7 +5,7 @@ ocamlPackages.buildDunePackage rec { pname = "soupault"; - version = "4.0.1"; + version = "4.1.0"; minimalOCamlVersion = "4.08"; @@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec { owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-Ojsup/BgXsqhRUsU6JevvuLnMtVs2Kd5kTeDvVO5BOk="; + sha256 = "sha256-fYobjkruzuUEVuIoH8mkaFdJvYp/I/aRQzgJXnQwX4U="; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index ee329828dc30..977cca7a25ea 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.48"; + version = "0.4.10"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-Hbvp8MV5usg0R+QXM7Laq9I6XeZnvuVCjj/aHmnskiE="; + sha256 = "sha256-3l/lvPSoO4CXMfEDhzCqHT0aOkQLPuvoXg8j/kZdUfU="; }; - vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; + vendorSha256 = "sha256-ATXM3+mi/R+/jS6Ds89J75nDVnc3d8iOGhjD3KQZkkA="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix index 9214f38b3303..5aadc4484045 100644 --- a/pkgs/tools/wayland/swaycwd/default.nix +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -5,24 +5,20 @@ }: nimPackages.buildNimPackage rec{ pname = "swaycwd"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitLab { owner = "cab404"; repo = pname; rev = "v${version}"; - hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk="; + hash = "sha256-VrG3H6oTeYsfncdD0IBp3zbmkoF5YF146LRxL064ZAE="; }; preConfigure = '' { echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' echo 'export enabledShells' - } > shells.nim - cat << EOF > swaycwd.nimble - srcDir = "." - bin = "swaycwd" - EOF + } > src/shells.nim ''; nimFlags = [ "--opt:speed" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ca3e06f2aa4a..c251784bb7cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1030,6 +1030,7 @@ mapAliases ({ pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd0e4d59f72..a2be714fc204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -394,6 +394,8 @@ with pkgs; commix = callPackage ../tools/security/commix { }; + conserver = callPackage ../tools/misc/conserver { }; + containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; crc = callPackage ../applications/networking/cluster/crc { }; @@ -3148,7 +3150,7 @@ with pkgs; cabal2nix = symlinkJoin { inherit (cabal2nix-unwrapped) name meta; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ buildPackages.makeWrapper ]; paths = [ cabal2nix-unwrapped ]; postBuild = '' wrapProgram $out/bin/cabal2nix \ @@ -4132,6 +4134,8 @@ with pkgs; jwt-hack = callPackage ../tools/security/jwt-hack { } ; + jwx = callPackage ../tools/security/jwx { } ; + kapacitor = callPackage ../servers/monitoring/kapacitor { }; kaldi = callPackage ../tools/audio/kaldi { }; @@ -7187,6 +7191,8 @@ with pkgs; efitools = callPackage ../tools/security/efitools { }; + sbctl = callPackage ../tools/security/sbctl { }; + sbsigntool = callPackage ../tools/security/sbsigntool { openssl = openssl_1_1; }; @@ -10213,6 +10219,8 @@ with pkgs; qarte = libsForQt5.callPackage ../applications/video/qarte { }; + qdrant = callPackage ../servers/search/qdrant { }; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; qnial = callPackage ../development/interpreters/qnial { }; @@ -10247,6 +10255,8 @@ with pkgs; qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + qovery-cli = callPackage ../tools/admin/qovery-cli { }; + qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -12030,6 +12040,8 @@ with pkgs; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; + wiringpi = callPackage ../os-specific/linux/wiringpi { }; + wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; wg-netmanager = callPackage ../tools/networking/wg-netmanager { @@ -16155,7 +16167,9 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; - dura = callPackage ../development/tools/misc/dura { }; + dura = callPackage ../development/tools/misc/dura { + inherit (darwin.apple_sdk.frameworks) Security; + }; dwfv = callPackage ../applications/science/electronics/dwfv { }; @@ -22495,6 +22509,8 @@ with pkgs; archiveopteryx = callPackage ../servers/mail/archiveopteryx { }; + asouldocs = callPackage ../servers/asouldocs { }; + atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; @@ -22611,6 +22627,10 @@ with pkgs; dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; + dmlive = callPackage ../applications/video/dmlive { + inherit (darwin.apple_sdk.frameworks) Security; + }; + do-agent = callPackage ../servers/monitoring/do-agent { }; dodgy = with python3Packages; toPythonApplication dodgy; @@ -23148,6 +23168,7 @@ with pkgs; mariadb_106 mariadb_107 mariadb_108 + mariadb_109 ; mariadb = mariadb_106; @@ -23402,6 +23423,7 @@ with pkgs; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; @@ -24134,6 +24156,8 @@ with pkgs; jujuutils = callPackage ../os-specific/linux/jujuutils { }; + karabiner-elements = callPackage ../os-specific/darwin/karabiner-elements { }; + kbd = callPackage ../os-specific/linux/kbd { }; kbdlight = callPackage ../os-specific/linux/kbdlight { }; @@ -25151,6 +25175,8 @@ with pkgs; charis-sil = callPackage ../data/fonts/charis-sil { }; + changie = callPackage ../development/tools/changie { }; + cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; chonburi-font = callPackage ../data/fonts/chonburi { }; @@ -29719,7 +29745,6 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; roxctl = callPackage ../applications/networking/cluster/roxctl { - buildGoModule = buildGo117Module; }; rqbit = callPackage ../applications/networking/p2p/rqbit { @@ -30110,8 +30135,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; - peach = callPackage ../servers/peach { }; - peaclock = callPackage ../applications/misc/peaclock { stdenv = gccStdenv; }; @@ -31866,7 +31889,10 @@ with pkgs; worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice { }; + wpsoffice-cn = libsForQt5.callPackage ../applications/office/wpsoffice { + useChineseVersion = true; + }; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -32618,6 +32644,8 @@ with pkgs; enigma = callPackage ../games/enigma { }; + everspace = callPackage ../games/everspace { }; + ezquake = callPackage ../games/ezquake { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; @@ -32973,6 +33001,8 @@ with pkgs; flock = callPackage ../development/tools/flock { }; + forge-mtg = callPackage ../games/forge-mtg { }; + freecell-solver = callPackage ../games/freecell-solver { }; freeciv = callPackage ../games/freeciv { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b38853008757..caa84277b0e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -16,14 +16,14 @@ let "native-bignum" "ghc902" "ghc924" - "ghc941" + "ghc942" "ghcHEAD" ]; nativeBignumIncludes = [ "ghc902" "ghc924" - "ghc941" + "ghc942" "ghcHEAD" ]; @@ -155,7 +155,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix { + ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 @@ -291,9 +291,9 @@ in { ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc941 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc941; - ghc = bh.compiler.ghc941; + ghc942 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc942; + ghc = bh.compiler.ghc942; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghcHEAD = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 697459fb317f..a4302879c415 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -787,12 +787,14 @@ let menhirSdk = callPackage ../development/ocaml-modules/menhir/sdk.nix { }; merlin = - if lib.versionAtLeast ocaml.version "4.11" + if lib.versionAtLeast ocaml.version "4.12" then callPackage ../development/tools/ocaml/merlin/4.x.nix { } else callPackage ../development/tools/ocaml/merlin { }; merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { }; + merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; metrics = callPackage ../development/ocaml-modules/metrics { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 68c1ac090161..501c2acf079a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -126,6 +126,7 @@ mapAliases ({ pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 + pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0a2aab1eb30..1fea51242f78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -476,6 +476,8 @@ in { airly = callPackage ../development/python-modules/airly { }; + airthings-ble = callPackage ../development/python-modules/airthings-ble { }; + airthings-cloud = callPackage ../development/python-modules/airthings-cloud { }; airtouch4pyapi = callPackage ../development/python-modules/airtouch4pyapi { }; @@ -7790,8 +7792,6 @@ in { pyjks = callPackage ../development/python-modules/pyjks { }; - pyjson5 = callPackage ../development/python-modules/pyjson5 { }; - pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 784f652ba2ca..28c4ac010e1f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -1678,10 +1678,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; kramdown = { dependencies = ["rexml"]; @@ -1887,10 +1887,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; molinillo = { groups = ["default"]; @@ -1907,10 +1907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; multi_json = { groups = ["default"]; @@ -2095,10 +2095,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdhkc7vp8hcb86ps94all4hrvhzfgs4d98kvss5rqh34v7ibs6m"; + sha256 = "0zk3fwwx8zzxhmfmlgzzr050jzsl58ma54wy99xy4xx0ibmw48pv"; type = "gem"; }; - version = "0.2.8"; + version = "1.0.4"; }; pango = { dependencies = ["cairo-gobject" "gobject-introspection"]; @@ -2137,10 +2137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9ab29r6fmblklxvhkpifmmpyzq7qw01lca00sn2ikkx2in3g6v"; + sha256 = "1v6my9g7bwjlx92hr9w0blnrcrai1yg3yz6k9xz0i6mq8lml2k87"; type = "gem"; }; - version = "0.4.3"; + version = "1.0.3"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -2230,10 +2230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.1"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -2241,10 +2241,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; pry-doc = { dependencies = ["pry" "yard"]; @@ -2273,10 +2273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; + sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.5"; }; racc = { groups = ["default"]; @@ -2439,10 +2439,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2598,10 +2598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wc3j624wyx5q7vd1s3dks7d9l85xk546dwr6472w9zjxykgzp3z"; + sha256 = "13fvwdx88v43q06frrkplspzl8ab4baspvnn9knl8pkxw9qg6p4x"; type = "gem"; }; - version = "1.35.0"; + version = "1.35.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2808,10 +2808,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0va9770p8qbr3sizjl1kpcr3pw9727nh70hplafay3gcalyk5x9z"; + sha256 = "029zk2w8d9lbxfj0aymrsw0fw675b1y4qd41chhjczj05kb7y8jb"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.2"; }; sequel = { groups = ["default"]; @@ -2829,10 +2829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m0ywaql7naj5y823s8h413gzc9h3vd4yr6mws94rcr8dr9hky77"; + sha256 = "1ix56by4qvpmn042431lzgg613ss5p0d8snjvf33hdr9y2q645qn"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2934,10 +2934,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11c7hcgg4sflhlj9lv9yh76sxrlk9a52y6p56xc99f0w015yyslh"; + sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x"; type = "gem"; }; - version = "0.45.0"; + version = "0.46.0"; }; sqlite3 = { groups = ["default"]; @@ -2955,10 +2955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v82jcbfhqx5k0ckb6anjshdhdi4bnqfi9ly5s2dmank8kdqc41l"; + sha256 = "13qapwg7vqz2vw98ivj484wqp7dwcwj78mhd474wglpli3galw5q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.0"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 422a7500516b..21bbb52cc63c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -78,6 +78,8 @@ let gnueabihf = lib.systems.parse.abis.musleabihf; gnuabin32 = lib.systems.parse.abis.muslabin32; gnuabi64 = lib.systems.parse.abis.muslabi64; + gnuabielfv2 = lib.systems.parse.abis.musl; + gnuabielfv1 = lib.systems.parse.abis.musl; # The following two entries ensure that this function is idempotent. musleabi = lib.systems.parse.abis.musleabi; musleabihf = lib.systems.parse.abis.musleabihf; @@ -257,8 +259,6 @@ let crossSystem = { isStatic = true; parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { - gcc.abi = "elfv2"; }; }); };